Remove more duplicated classes

Change-Id: Ib0f9230716c56ed770101108793e598dab0b29d7