cleanup / unused stuff
slightly improve caching