Removed old regex