Cleaned up merge remnant