refactor saWhoring

Arkerthanrequested to merge
Arkerthan/fc-pregmod:clean-sa into pregmod-master

I was 100% sure I had done this together with the others. Anyways, here is the last sa refactor

Merge request reports