Cleanup/staggered grid remove stencils

Merge request reports