oops cleanup merge cruft