removed some unwanted variables