All - modified

removed unwanted variables