OCSADV-200: cleanup key set -> vector creation