[HB,CB]{test after code} Clean up