Fixed comment removal