fixed comments removal