Remove added parts furing merge