clean up models to build user model