remove old unused caching mechanism + some dead code