clean up of dead code...