Merge pull request #24 from dart-lang/cleanup

Cleanup