Cleanup, Trying to deal with bizarre table-locking issues.