Remove generic typing on Grid