ES5 option is now set per default
Cleanup