removed unused code (UCDetector)
narrowed visibilities where applicable (UCDetector)