Remove usage of deprectaed Options Resolver interface