Cleaned up merge cruft