Removing the comments that were not used