clean up the user models - use simple user as the model for now