Remove some dead code, remove some unused code.