Get rid of a couple of puzzle grid helpers.