cleaning up more dead code