matcher clean up