Clean up DataSet interface