comdiv usefull ref removed
small fixes
#ZC-381 old core is not more dependency