Additional code cleanup.  Removed unneccessary code.
Removed unneccessary code.