clean comments and remove ctxTriggered workaround