Just a model cleanup for User