Remove caching, minor cleanups