Removing cruft/comments