common/cpt: remove redundant structure