diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetAncestors.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetAncestors.java
index 104556068..e537a0c45 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetAncestors.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetAncestors.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import picocli.CommandLine;
@@ -25,7 +24,7 @@ public class GetAncestors implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBakerList.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBakerList.java
index 3e635c020..8a6743212 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBakerList.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBakerList.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import picocli.CommandLine;
@@ -25,7 +24,7 @@ public class GetBakerList implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockInfo.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockInfo.java
index 252230631..b49c09c19 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockInfo.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockInfo.java
@@ -2,11 +2,9 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import com.concordium.sdk.responses.blockinfo.BlockInfo;
-import lombok.var;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -24,7 +22,7 @@ public class GetBlockInfo implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockItemStatus.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockItemStatus.java
index 3588a1394..d16a76db8 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockItemStatus.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBlockItemStatus.java
@@ -1,11 +1,8 @@
 package com.concordium.sdk.examples;
 
-import com.concordium.grpc.v2.BlockItemStatus;
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
-import com.concordium.sdk.responses.transactionstatus.TransactionStatus;
 import com.concordium.sdk.transactions.Hash;
 import lombok.val;
 import lombok.var;
@@ -30,7 +27,7 @@ public class GetBlockItemStatus implements Callable<Integer> {
     private final Hash blockTransactionHashSuccess = Hash.from("1ea074f0e12e18684f2d6bbf2039c6db32d2fd5c28e6ba74c8e92f36e88b1901");
 
     @Override
-    public Integer call() throws MalformedURLException, ClientInitializationException, BlockNotFoundException {
+    public Integer call() throws MalformedURLException, ClientInitializationException {
         var endpointUrl = new URL(this.endpoint);
 
         Connection connection = Connection.newBuilder()
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBranches.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBranches.java
index 640b0928d..381864da8 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBranches.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetBranches.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.responses.branch.Branch;
 import picocli.CommandLine;
@@ -22,7 +21,7 @@ public class GetBranches implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetCryptographicParameters.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetCryptographicParameters.java
index 21efcd055..4315ac91e 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetCryptographicParameters.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetCryptographicParameters.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import com.concordium.sdk.responses.cryptographicparameters.CryptographicParameters;
@@ -25,7 +24,7 @@ public class GetCryptographicParameters implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws MalformedURLException, ClientInitializationException, BlockNotFoundException {
+    public Integer call() throws MalformedURLException, ClientInitializationException {
         var endpointUrl = new URL(this.endpoint);
 
         Connection connection = Connection.newBuilder()
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetElectionInfo.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetElectionInfo.java
index 41fbff9fd..99466a552 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetElectionInfo.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetElectionInfo.java
@@ -2,11 +2,9 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
-import com.concordium.sdk.responses.election.ElectionInfo;
 import com.concordium.sdk.requests.BlockQuery;
-import lombok.var;
+import com.concordium.sdk.responses.election.ElectionInfo;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -24,7 +22,7 @@ public class GetElectionInfo implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetInstanceList.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetInstanceList.java
index a5112788f..1af6e1cf0 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetInstanceList.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetInstanceList.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import picocli.CommandLine;
@@ -25,7 +24,7 @@ public class GetInstanceList implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetModuleList.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetModuleList.java
index 9f8b46259..097b6d226 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetModuleList.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetModuleList.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import picocli.CommandLine;
@@ -25,7 +24,7 @@ public class GetModuleList implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetNodeInfo.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetNodeInfo.java
index 2a1abe86d..5b5a68e61 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetNodeInfo.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetNodeInfo.java
@@ -2,7 +2,7 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.responses.nodeinfov2.NodeInfo;
+import com.concordium.sdk.responses.nodeinfo.NodeInfo;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetTokenomicsInfo.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetTokenomicsInfo.java
index 5159c77e2..bce646244 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetTokenomicsInfo.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/GetTokenomicsInfo.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import com.concordium.sdk.requests.BlockQuery;
 import picocli.CommandLine;
@@ -22,7 +21,7 @@ public class GetTokenomicsInfo implements Callable<Integer> {
     private String endpoint;
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())
diff --git a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/Shutdown.java b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/Shutdown.java
index 8c8d087da..626af62a9 100644
--- a/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/Shutdown.java
+++ b/concordium-sdk-examples/src/main/java/com/concordium/sdk/examples/Shutdown.java
@@ -2,7 +2,6 @@
 
 import com.concordium.sdk.ClientV2;
 import com.concordium.sdk.Connection;
-import com.concordium.sdk.exceptions.BlockNotFoundException;
 import com.concordium.sdk.exceptions.ClientInitializationException;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -29,7 +28,7 @@ public static void main(String[] args) {
     }
 
     @Override
-    public Integer call() throws ClientInitializationException, MalformedURLException, BlockNotFoundException {
+    public Integer call() throws ClientInitializationException, MalformedURLException {
         URL endpointUrl = new URL(this.endpoint);
         Connection connection = Connection.newBuilder()
                 .host(endpointUrl.getHost())