Nii - removed and commented out some unused code