diff --git a/src/main/java/net/helenus/core/operation/AbstractOperation.java b/src/main/java/net/helenus/core/operation/AbstractOperation.java
index aff7d77..09649dd 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOperation.java
@@ -41,7 +41,7 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> ex
 		return new PreparedOperation<E>(prepareStatement(), this);
 	}
 
-	public E sync() throws TimeoutException {
+	public E sync() {//throws TimeoutException {
 		final Timer.Context context = requestLatency.time();
 		try {
 			ResultSet resultSet = this.execute(sessionOps, null, traceContext, queryExecutionTimeout, queryTimeoutUnits,
@@ -52,7 +52,7 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> ex
 		}
 	}
 
-	public E sync(UnitOfWork uow) throws TimeoutException {
+	public E sync(UnitOfWork uow) {//throws TimeoutException {
 		if (uow == null)
 			return sync();
 
@@ -69,11 +69,11 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> ex
 
 	public CompletableFuture<E> async() {
 		return CompletableFuture.<E>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 
@@ -81,11 +81,11 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> ex
 		if (uow == null)
 			return async();
 		return CompletableFuture.<E>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 }
diff --git a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
index 9a14a02..86e3dd8 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
@@ -64,7 +64,7 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 				});
 	}
 
-	public Optional<E> sync() throws TimeoutException {
+	public Optional<E> sync() {//throws TimeoutException {
 		final Timer.Context context = requestLatency.time();
 		try {
 			ResultSet resultSet = this.execute(sessionOps, null, traceContext, queryExecutionTimeout, queryTimeoutUnits,
@@ -75,7 +75,7 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 		}
 	}
 
-	public Optional<E> sync(UnitOfWork<?> uow) throws TimeoutException {
+	public Optional<E> sync(UnitOfWork<?> uow) {//throws TimeoutException {
 		if (uow == null)
 			return sync();
 
@@ -118,11 +118,11 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 
 	public CompletableFuture<Optional<E>> async() {
 		return CompletableFuture.<Optional<E>>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 
@@ -130,11 +130,11 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 		if (uow == null)
 			return async();
 		return CompletableFuture.<Optional<E>>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 }
diff --git a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
index 0d3e1d8..a51e522 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
@@ -57,7 +57,7 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 				});
 	}
 
-	public Stream<E> sync() throws TimeoutException {
+	public Stream<E> sync() {//throws TimeoutException {
 		final Timer.Context context = requestLatency.time();
 		try {
 			ResultSet resultSet = this.execute(sessionOps, null, traceContext, queryExecutionTimeout, queryTimeoutUnits,
@@ -68,7 +68,7 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 		}
 	}
 
-	public Stream<E> sync(UnitOfWork<?> uow) throws TimeoutException {
+	public Stream<E> sync(UnitOfWork<?> uow) {//throws TimeoutException {
 		if (uow == null)
 			return sync();
 
@@ -105,11 +105,11 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 
 	public CompletableFuture<Stream<E>> async() {
 		return CompletableFuture.<Stream<E>>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 
@@ -117,11 +117,11 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 		if (uow == null)
 			return async();
 		return CompletableFuture.<Stream<E>>supplyAsync(() -> {
-			try {
+//			try {
 				return sync();
-			} catch (TimeoutException ex) {
-				throw new CompletionException(ex);
-			}
+//			} catch (TimeoutException ex) {
+//				throw new CompletionException(ex);
+//			}
 		});
 	}
 }
diff --git a/src/main/java/net/helenus/core/operation/InsertOperation.java b/src/main/java/net/helenus/core/operation/InsertOperation.java
index c92dac4..0f08c20 100644
--- a/src/main/java/net/helenus/core/operation/InsertOperation.java
+++ b/src/main/java/net/helenus/core/operation/InsertOperation.java
@@ -237,7 +237,7 @@ public final class InsertOperation<T> extends AbstractOperation<T, InsertOperati
 	}
 
 	@Override
-	public T sync(UnitOfWork uow) throws TimeoutException {
+	public T sync(UnitOfWork uow) {//throws TimeoutException {
 		if (uow == null) {
 			return sync();
 		}
diff --git a/src/main/java/net/helenus/core/operation/Operation.java b/src/main/java/net/helenus/core/operation/Operation.java
index a9f1b51..62fb849 100644
--- a/src/main/java/net/helenus/core/operation/Operation.java
+++ b/src/main/java/net/helenus/core/operation/Operation.java
@@ -49,7 +49,7 @@ public abstract class Operation<E> {
 	}
 
 	public ResultSet execute(AbstractSessionOperations session, UnitOfWork uow, TraceContext traceContext, long timeout,
-			TimeUnit units, boolean showValues, boolean cached) throws TimeoutException {
+			TimeUnit units, boolean showValues, boolean cached) { //throws TimeoutException {
 
 		// Start recording in a Zipkin sub-span our execution time to perform this
 		// operation.
@@ -68,7 +68,7 @@ public abstract class Operation<E> {
 
 			Statement statement = options(buildStatement(cached));
 			ResultSetFuture futureResultSet = session.executeAsync(statement, showValues);
-			return futureResultSet.getUninterruptibly(timeout, units);
+            return futureResultSet.getUninterruptibly(); //TODO(gburd): (timeout, units);
 		} finally {
 
 			if (span != null) {
diff --git a/src/main/java/net/helenus/core/operation/UpdateOperation.java b/src/main/java/net/helenus/core/operation/UpdateOperation.java
index e7a2822..201365d 100644
--- a/src/main/java/net/helenus/core/operation/UpdateOperation.java
+++ b/src/main/java/net/helenus/core/operation/UpdateOperation.java
@@ -570,13 +570,12 @@ public final class UpdateOperation<E> extends AbstractFilterOperation<E, UpdateO
 	}
 
 	@Override
-	public E sync(UnitOfWork uow) throws TimeoutException {
+	public E sync(UnitOfWork uow) {//throws TimeoutException {
 		if (uow == null) {
 			return sync();
 		}
 		E result = super.sync(uow);
-		// TODO(gburd): Only drafted entity objects are updated in the cache at this
-		// time.
+		// TODO(gburd): Only drafted entity objects are updated in the cache at this time.
 		if (draft != null) {
 			updateCache(uow, result, getFacets());
 		}
diff --git a/src/test/java/net/helenus/test/integration/core/views/MaterializedViewTest.java b/src/test/java/net/helenus/test/integration/core/views/MaterializedViewTest.java
index 09f56c4..a733c1e 100644
--- a/src/test/java/net/helenus/test/integration/core/views/MaterializedViewTest.java
+++ b/src/test/java/net/helenus/test/integration/core/views/MaterializedViewTest.java
@@ -57,7 +57,7 @@ public class MaterializedViewTest extends AbstractEmbeddedCassandraTest {
             .get();
     cyclist = session.dsl(Cyclist.class);
 
-    try {
+    //try {
       session
           .insert(cyclist)
           .value(cyclist::cid, UUID.randomUUID())
@@ -66,8 +66,8 @@ public class MaterializedViewTest extends AbstractEmbeddedCassandraTest {
           .value(cyclist::country, "Netherlands")
           .value(cyclist::name, "Pascal EENKHOORN")
           .sync();
-    } catch (TimeoutException e) {
-    }
+    //} catch (TimeoutException e) {
+    //}
   }
 
   @Test