cleaning up of dead code