TDB tracking.  Misc cleanup.