ecma7 cleanup