cleanup
retain audienceOrSPn
refactor