Removed unused dependency
More apache regex improvements