removed caching things