cleanup some stuff from common

Change-Id: If889fb9a93d9f5219e4ffbe3490fee372a979e3a