unneccessary globals removed