Ran UCDetector - removed dead code and reduced visibility