Completely remove Options dependency.