Removed old regex stuff