Cleaned up merge fallout