Clean up and add filters.
Clean up.