Cleanup remove common

Change-Id: I655bc3e755da4234d5f2c8a45212668fe7245c87