Remove Detector class, replace by Matcher lib