Cleaned up code for validate user. Removed uncommented stuff.