remove caching and other updates