More grid/container cleanup