HV-646 Removing some more dead code