Kill clutter

remove the crud, round 1