Major cleanup of walk filters