Clean infinispan references