matcher cleanup
matcher cleanup