match view cleanup