more chapter 4 cleanup