some cleanup with Dart imports resolve