fix user model, cleanup