-# some idiot has a script that tries to talk to me
-# this should catch and dispose of him
-if ((grep {/rgergerger|\@pgbuildfarm\.org|Content-Type:|http:|mailto:|href=|None|Unknown/} $os,$osv,$comp,$compv,$arch,$email,$owner)
- || ($email =~ /john.*\@aol.com/) )
+# these filters should catch and dispose of idiots,
+# although I hope they are redundant now we're using captchas.
+
+if ((grep
+ {/\@pgbuildfarm\.org|Content-Type:|http:|mailto:|href=|None|Unknown/}
+ $os,$osv,$comp,$compv,$arch,$email,$owner))