Cleanup
Testing environment fixes
Trim down the controller