more cleaning in ch04