Removal of some garbage code