Remove usage of one global var in favor of static class var