Revert of revert - Revert "Cleaning up"

This reverts commit b7e864fc070f9eb8239be363db3db2b09073de68.
Uncomment 'new' method for user controller