Removing most references to grids in YSLD