Removing comments and unneeded field