clean up user model, add db migration