delete debug control
Improve Regex