Clean up OptionProcess to make sure it gets called before and after SiteStart