diff --git a/atf.inc.php b/atf.inc.php
index 4163e56..bd5294b 100644
--- a/atf.inc.php
+++ b/atf.inc.php
@@ -146,9 +146,9 @@ class ATFSession
   function __construct()
   {
     $this->guid = atf_guid();
-    $this->branch = taskman_prop('GAME_VERSION_BRANCH'); 
-    $this->version = taskman_prop('GAME_VERSION');
-    $this->rev_hash = taskman_prop('GAME_REVISION_HASH');
+    $this->branch = get('GAME_VERSION_BRANCH'); 
+    $this->version = get('GAME_VERSION');
+    $this->rev_hash = get('GAME_REVISION_HASH');
   }
 
   function incBogusDevice($device)
@@ -577,7 +577,7 @@ class ATFPlan
         if($check_error !== null)
         {
           $this->_ignoreDevice($device, $check_error);
-          if (!taskman_prop('EXT_BOT_ERROR_PAUSE'))
+          if (!get('EXT_BOT_ERROR_PAUSE'))
             $task->reschedule();
         }
 
@@ -651,7 +651,7 @@ class ATFPlan
       atf_slack_post("Last logs: ```$app_log``` *{$task->device}*", array('thread_ts' => $task->slack_thread_ts));
     }
 
-    if (!taskman_prop('EXT_BOT_ERROR_PAUSE'))
+    if (!get('EXT_BOT_ERROR_PAUSE'))
       $task->reschedule();
       
     });
@@ -1169,7 +1169,7 @@ function _atf_get_local_file_crc($path)
   if(!is_file($path))
     return '';
 
-  taskman_shell_ensure("crc32 $path", $out);
+  shell("crc32 $path", $out);
   return trim($out[0]);
 }
 
@@ -1330,6 +1330,7 @@ function _atf_db()
 
 function atf_stats_send($table, array $data)
 {
+  return;
   $db = _atf_db();
   $db->insert($table, array(array_values($data)), array_keys($data));
 }
@@ -1522,13 +1523,13 @@ function atf_host()
 
   deploy_declare_node($node_name, 
     array(
-      'user' => taskman_prop("ATF_USER"),
+      'user' => get("ATF_USER"),
       'dir' => '',
-      'ssh_key_str' => taskman_prop("ATF_KEY"), 
-      'hosts' => array(taskman_prop("ATF_HOST")),
-      'adb' => taskman_prop("ATF_HOST_ADB"),
-      'package_id' => taskman_prop("PACKAGE_ID"),
-      'activity' => taskman_prop("LAUNCHER_ACTIVITY")
+      'ssh_key_str' => get("ATF_KEY"), 
+      'hosts' => array(get("ATF_HOST")),
+      'adb' => get("ATF_HOST_ADB"),
+      'package_id' => get("PACKAGE_ID"),
+      'activity' => get("LAUNCHER_ACTIVITY")
     )
   );