Clean up ES6 hook