Started conversion to strict mode