Reduced the amont of ES3 in-compatible code