removing cruft, etc