oops, removing cruft