Bugfix: Punctuation removal