Cleanup merge cruft