Remove some dead code