Cleaned up some variables which were now extraneous that were missed on
the last rev.