Removing the evacuation code