[snapshot/restore] First stage or repository refactoring - make them static
[snapshot/restore] Cleanup after refactoring