cleaned match .xml base
removed unused imports