Fixed cleanup-db to do both nfs and tmp dbs.