Removed error in MatchManager and cleaned imports