#1072 Cleanup Before Filter

Resolves #1072.