Cleanup transform-grid, same functionality