Clean up users model