Northbound cleanup for Flow programmer