remove some legacy remaining options stuff