Remove references to deleted code