Refactoring tree part of maps, committed without testing (checkpoint)