HHH-8152 - General cleanup