Old civil defense plan scrapped