Connection classes removed from aid and vip
merge