Dart 1.0 Cleanup