Removal of dead code