Temping/Removing variables

kopareignsrequested to merge
kopareigns/fc-pregmod:fixes into pregmod-master

Also stuff sanity check caught.

Merge request reports