Clean-up of dead code