clean up controller and make sure i'm in sync