Update: cleanups to labyrinth/grid