Refactoring

Dropping those matches as they are not needed