Comments remove and cleanup