Remove unnecessary cruft