removing some regex stuff (damn problems)