Remove usage of deprecated Options Resolver interface