WL-3021 Drop references to subject.