Massive tidy. Removed validation from User.