Clean up controllers