Refactor resetCrate without surfaces
Completely get rid of surfaces