Remove duplicated classes

Change-Id: If2e246023c5c013efb3d3b44817580ef7a33ae49