removed dependency on OS variables