Some code cleanup and additional testing of cleaned up code.  Found some proposed changes broke things so they were removed.  The cleaned up code works in the state it is in with this release.