Fixing performance regression bug and removing versionist dependency