removed some old globals