More comments removal