Cleanup to dependency bugfix in database building.