Slowly cleaning up our leveraged filters