Clean up for data grid code