take out some dead code