Revert adding of basic grid - see grid branch