Remove unneeded migrations
Merge changes with Github
Fix password reset error