Use the same subject cleanup code regardless of the source of the subject