Goodbye cruft