removed unused and unwanted variables