#73 Pland & Facility cleanup