Convert all static class variables to normal class variables, it also fix calls to these static class variables