Unwanted variables removed