Cleaning up terrain storage refactoring