remove common, bring everything into header from common