removed some variables/functions