close #483 remove static from non storage class functions