removed some old and unused stuff
diff --git a/aos/build/aos_all.gyp b/aos/build/aos_all.gyp
index e766b59..bda36fa 100644
--- a/aos/build/aos_all.gyp
+++ b/aos/build/aos_all.gyp
@@ -13,7 +13,6 @@
         '../atom_code/camera/camera.gyp:CameraHTTPStreamer',
         '../atom_code/camera/camera.gyp:CameraReader',
         '../atom_code/core/core.gyp:*',
-        #'../atom_code/async_action:*', # TODO(brians) fix this broken test
         '../atom_code/ipc_lib/ipc_lib.gyp:*',
         '../atom_code/starter/starter.gyp:starter_exe',
         '../atom_code/starter/starter.gyp:netconsole',
diff --git a/frc971/atom_code/atom_code.gyp b/frc971/atom_code/atom_code.gyp
index 23c4f5b..0aceec0 100644
--- a/frc971/atom_code/atom_code.gyp
+++ b/frc971/atom_code/atom_code.gyp
@@ -19,7 +19,6 @@
         '../autonomous/autonomous.gyp:auto',
         '../input/input.gyp:JoystickReader',
         '../input/input.gyp:GyroReader',
-        #'../input/input.gyp:AutoMode',
         '../../vision/vision.gyp:OpenCVWorkTask',
         '../../vision/vision.gyp:GoalMaster',
         '../output/output.gyp:MotorWriter',
diff --git a/frc971/atom_code/atom_code.gyp.orig b/frc971/atom_code/atom_code.gyp.orig
deleted file mode 100644
index d727036..0000000
--- a/frc971/atom_code/atom_code.gyp.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'All',
-      'type': 'none',
-      'dependencies': [
-        '<(AOS)/build/aos_all.gyp:Atom',
-        '../control_loops/control_loops.gyp:DriveTrain',
-        '../input/input.gyp:JoystickReader',
-        '../input/input.gyp:SensorReader',
-        '../input/input.gyp:GyroReader',
-        '../input/input.gyp:AutoMode',
-        '../output/output.gyp:MotorWriter',
-        '../output/output.gyp:CameraServer',
-        'camera/camera.gyp:frc971',
-      ],
-      'copies': [
-        {
-          'destination': '<(rsync_dir)',
-          'files': [
-            'scripts/aos_module.ko',
-            'scripts/start_list.txt',
-          ],
-        },
-      ],
-    },
-  ],
-}
diff --git a/frc971/input/AutoMode.act b/frc971/input/AutoMode.act
deleted file mode 100644
index b7b98c3..0000000
--- a/frc971/input/AutoMode.act
+++ /dev/null
@@ -1,7 +0,0 @@
-args automode_args {
-};
-status automode_status {
-};
-//has OnEnd;
-//has OnStart;
-priority 99;
diff --git a/frc971/input/AutoMode.cc b/frc971/input/AutoMode.cc
deleted file mode 100644
index 254d6b6..0000000
--- a/frc971/input/AutoMode.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "frc971/input/AutoMode.q.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "aos/common/control_loop/Timing.h"
-
-namespace frc971 {
-
-void AutoMode_t::DoAction() {
-  Sleep(10); // wait until it ends
-}
-
-} // namespace frc971
diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index 64173ef..5e08a20 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -1,18 +1,6 @@
 {
   'targets': [
     {
-      'target_name': 'actions',
-      'type': 'static_library',
-      'sources': ['AutoMode.act'],
-      'variables': {
-        'header_path': 'frc971/input',
-      },
-      'dependencies': [
-        '<(AOS)/common/common.gyp:controls',
-      ],
-      'includes': ['../../aos/build/queues.gypi'],
-    },
-    {
       'target_name': 'JoystickReader',
       'type': 'executable',
       'sources': [