Revise Nick's regex
Remove dumb plugins