[General] Add ReDoS protection for regex matching and nit fixes.

[Tyme-Bleyaert]

Pull Request

📖 Description

Just a small pr targeting some nit issues and ReDoS for Regex.
Also removed some unused code where I encountered some.

✅ Checklist

General

• I have added tests for my changes.
• I have tested my changes.
• I have updated the project documentation to reflect my changes.
• I have read the CONTRIBUTING documentation and followed the standards for this project.

Component-specific

• I have added a new component
• I have added Unit Tests for my new component
• I have modified an existing component
• I have validated the Unit Tests for an existing component