Use regex for bracket removal

Ok, this really simplified the method.