Some more cleanup users controller [#74521656]