SWC-1704 only

remove?