bring "removing unwanted" code in line with the other parts

should not make any difference, but it's cleaner anyway...