Refactor control logic so control methods only know about themselves, remove dead code