CRUNCH-142 Delegate cleanup on decorator FilterFns