data driver changed cleanup() to goto style

The cleanup() function has been removed from data
driver in favor of the simpler and more common
goto style.