Take out NEED_CD