Clean up with match