clean up some more dead code