remove obsolete builder

Change-Id: I2958f4d419a1929a2ee84f7cb9752109f17e5fd0