Refactor progress: removed users controller
Finished refactor pass, including comment cleanup and reorganization