Update filter code to be slightly more efficient by skipping redundant checks
Remove code that is now unecessary with more evented handler code.