removed underscore
removed legacy functions
removed static variables