Remove grids dependency from demos (except prefixes/suffixes; to be fixed separately)