Cruft tidy-up