Clean up menu controller