fixing the migration to go with the rest of the 1.5 user model changes
removed unused imports
Merge remote-tracking branch 'tijs/auth-user-model-changes'