Eliminate cruft