update org, remove simple keys