Clean up controllers

Just removing unused imports and code that is commented out.