Adding Stuff

Added automator removal and cleaned up some code.