Removal of some dead code