Clean up grid functionality