Commented out filter handlers for the moment too