Clean up of Ehcache and dependencies