BUG-FIX Expressions need changing in regexps, clear unused regexps