Clean up slim parts of merge