Partially Fixed Bug When Removing Matches

The bug about automatically removing matches is partially fixed.
However it still removes matches if it's not in live matches list, but
is a future match instead.