move old/current under Maps class; make tombstones non-volatile final