Cut out a few slides, add fixes to code smell slides