Tiny refactor about remove scope AccountVersion.o2n