Cleaning up comments for prod release