removed some pointless caching