add triggerCleanupFunctions call
control call type if needed