Removal of remnant code