Removed old controller methods and cleaned up instruction