removed some ghetto caching code