Removed deprecated Matcher imports