another pass to improve es6 module usage
Merge pull request #5010 from stefanpenner/es6-cleanup

Es6 cleanup