cleanup of cp_p