HHH-8733 - General build cleanup