Different stripping algorithm

Not that cute, but it works this time.
Merge branch 'strip-mentions'