Reduce cruft based on feedback.