removed some regex