First round of cruft removed