S2s gv

Removing GlobalVariable usage in s2s library code