Removed merge remnants