Remove excess variables