took out some more dead code