no caching working, minor cleanup