removed unused line
refactored work with matching service