ch02 cleanup