clean up matching