HHH-8336 remove deprecated types