removed disk-db stuff as it's no longer needed (and when we need that
later we can externalize it properly)