removed some variables