fixed bugs in comments removal