cleanup to use only get/set_site_option