Clean up after merge of database and gui.