Removal of code to be replaced