Removed OpenWrap and updated to latest Castle Windsor