Clears UsersController, however tests are leftover
Merge and something