remove un-unsed variables.
Getting rid of some compiler warnings.
white space diffs.