remove some more changes that are not related to celltemplate