cleanup in match view