remove some dead code