some cleanup and AUTH_USER_MODEL support