Week 8, small cleanup