Cleaning up autocode

This revision is confirmed runnning the auto plugin properly in both UI and in a cli client