cleanup code and remove cpt