got rid of some dead code