#8 clean up closing in FacilityImpl