Remove some dead code...