removed unneeded caching of options