Cleaning up after database and gui merge.