Stratum: Move layout out of standard stratum import file
Demo: Remove references to grid variables

Where stratum/grid is not directly imported.
Demo: Disable unused features