HH-44762 remove some unneccessary stuff