@rough-minister-58256 : well, without more design work, i think we should be able to deprecate anything that is only used by v1...?