removed some global data