cleanup global space

remove some global vars