Remove CWC code for now