[FIXED JENKINS-23523] Fix external delete reg. exp and refactoring