Reduce cruft