Trigger cleanup