Cleanup of older versons of dock code for importing datasets