User model cleanup

First of many clean up pull requests.