Got rid of useless imports in the grid module