comments removal fix