removing cruft...