remove merged parts

Change-Id: I482da4e182084b278a6125ad08291640bf45f287