cleaning up trigger-fns