Cleanup users_controller, removes deprecations, fixes superuser related tests.