diff --git a/lib/coinatmradar/coinatmradar.js b/lib/coinatmradar/coinatmradar.js
index 0d83e0f8..822dd8e1 100644
--- a/lib/coinatmradar/coinatmradar.js
+++ b/lib/coinatmradar/coinatmradar.js
@@ -67,24 +67,16 @@ function mapMachine (rates, settings, machineRow) {
   const triggerCashLimit = complianceTriggers.getCashLimit(triggers)
   const locale = configManager.getLocale(deviceId, config)
   const cashOutConfig = configManager.getCashOut(deviceId, config)
+  const cashOutEnabled = cashOutConfig.active ? cashOutConfig.active : false
 
   const lastOnline = machineRow.last_online.toISOString()
   const status = machineRow.stale ? 'online' : 'offline'
-  const showSupportedCryptocurrencies = coinAtmRadar.supportedCryptocurrencies
-  const showSupportedFiat = coinAtmRadar.supportedFiat
-  const showSupportedBuySellDirection = coinAtmRadar.supportedBuySellDirection
   const showLimitsAndVerification = coinAtmRadar.limitsAndVerification
 
   const cashLimit = showLimitsAndVerification ? ( triggerCashLimit || Infinity ) : null
-
   const cryptoCurrencies = locale.cryptoCurrencies
-  const cashInEnabled = showSupportedBuySellDirection ? true : null
-  const cashOutEnabled = showSupportedBuySellDirection ? cashOutConfig.active : null
-  const fiat = showSupportedFiat ? locale.fiatCurrency : null
   const identification = mapIdentification(config)
-  const coins = showSupportedCryptocurrencies ? 
-    _.map(_.partial(mapCoin, [rates, deviceId, settings]), cryptoCurrencies)
-    : null
+  const coins = _.map(_.partial(mapCoin, [rates, deviceId, settings]), cryptoCurrencies)
 
   return {
     machineId: deviceId,
@@ -102,14 +94,14 @@ function mapMachine (rates, settings, machineRow) {
     },
     status,
     lastOnline,
-    cashIn: cashInEnabled,
+    cashIn: true,
     cashOut: cashOutEnabled,
     manufacturer: 'lamassu',
     cashInTxLimit: cashLimit,
     cashOutTxLimit: cashLimit,
     cashInDailyLimit: cashLimit,
     cashOutDailyLimit: cashLimit,
-    fiatCurrency: fiat,
+    fiatCurrency: locale.fiatCurrency,
     identification,
     coins
   }
@@ -139,7 +131,6 @@ function sendRadar (data) {
     timeout: TIMEOUT,
     maxContentLength: MAX_CONTENT_LENGTH
   }
-
   console.log('%j', data)
 
   return axios(config)