time transaction changes and clean up (bug 877830)