Cleanup users controller [#74521656]