Removing comments, updating requirements