Shouldn't need Diabook anymore.