Removal of this code