Cleanup + Add version check to vault variables