Dataset Management and Data Product Management Cleanup

Ready