Removed more dependency on the windsor version