Remove unused stuff
Make regex matching work. Sort of.