More UCDetector cleanup