Remove asserts and temporary variables
AdaptiveMatcher needs to Inherit from NormalizedMatcher