file cleanup

removing the commented old class
adding the regex stuff, hoping it works with no tweaking

I'm on the train with a shitty teamviewer connection and i don't feel like trying to diagnose in this situation.