Removal of replaced code