remove comments and leftover do