delete incorrect matches; refactoring of imports