Reduce garbage generation.  Deprecate a grid method that was creating garbage.
Merge remote-tracking branch 'origin/master'