Hmmm, you've removed `addClusterEnabledCacheManager` now (or maybe I was blind...), so you don't need the `remove` call anymore? 

The rest is fine as is.