Grid demo cleanup