removing some dead code...