Controller cleanups