ref #5752 revert last 3 "cleanup dependencies in taxeditor.cdmlib"