Clearing up controllers