removing cruft some more