Removing unnecessary comments/options