Regex hardening
Fixing rm