Pull 1685

Lets see if sending a pull request to pull request works...

There were two test failures because nullable remove() didn't work correctly. In addition a little more tx control added and some cleanup done.