removing cruft'