Removing old controller/state machine code from app project