Removed dependency on the windsor version of glass