Cleanup after merge of ui-db branch.