Cleaning up old controller scaffolding junk
Fixing tests
Merge pull request #1260 from elzj/controller_cleanup

Cleaning up old controller scaffolding junk