refactor: cleanup cluster ESM issue workaround