- remove some dead code