Cleaning up AD operator interface