one last current database assumption to remove for now