Fixing User model, removing track_who_does_it