Cleanup matchers
Cleanup matchers

jeanlinux/datagrid,bogdan/datagrid,sadaf2605/datagrid,reenhanced/datagrid,reenhanced/datagrid,jeanlinux/datagrid,sadaf2605/datagrid,artofhuman/datagrid,artofhuman/datagrid,bogdan/datagrid