WC-393 #comment bn.ds, bn.sm deleted in progress