Take out NEED_CD code