removing comments and unecessary username field