#35 Facility close cleanup