Cleaning up old bits of the core
Didn't need the caching class