Remove todo regex as it wasn't performing correctly