tidy imports and switch over to use das source registry API