es7 cleanup