remove unneeded caching