killbill-uncached

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
index 6e84d68..ecdc194 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
@@ -301,14 +301,7 @@ public class AdminResource extends JaxRsResourceBase {
                     generator.close();
                 } finally {
                     // In case the client goes away (IOException), make sure to close the underlying DB connection
-                    if (tags instanceof Closeable) {
-                        ((Closeable) tags).close();
-                    } else {
-                        // TODO 0.20.x (https://github.com/killbill/killbill/issues/558)
-                        while (iterator.hasNext()) {
-                            iterator.next();
-                        }
-                    }
+                    tags.close();
                 }
             }
         };

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
index 8a45b83..f0490db 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -350,14 +350,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
                     generator.close();
                 } finally {
                     // In case the client goes away (IOException), make sure to close the underlying DB connection
-                    if (entities instanceof Closeable) {
-                        ((Closeable) entities).close();
-                    } else {
-                        // TODO 0.20.x (https://github.com/killbill/killbill/issues/558)
-                        while (iterator.hasNext()) {
-                            iterator.next();
-                        }
-                    }
+                    entities.close();
                 }
             }
         };