removed remnants of db profiling
cleanup of entity caching code