Almost fixed comment removal