Cleaned up some of the non-admin controllers
Fixes merge conflicts.