HW class 4 cleanup