more gridbuilder cleanup