removing cruft;