Removed cp_id