Remove ES6 features