Clean-up for Dart SDK version 0.4.3.5_r20602