wip on removing version handler key