diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
index 42b36da769..43a2ed3e1f 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
@@ -19,7 +19,6 @@ package org.jclouds.openstack.cinder.v1;
 import java.io.Closeable;
 import java.util.Set;
 
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Region;
 import org.jclouds.location.functions.RegionToEndpoint;
 import org.jclouds.openstack.cinder.v1.domain.Snapshot;
@@ -37,7 +36,7 @@ import org.jclouds.rest.annotations.EndpointParam;
 import com.google.inject.Provides;
 
 /**
- * Provides synchronous access to OpenStack Block Storage (Cinder) v1 API.
+ * Provides access to OpenStack Block Storage (Cinder) v1 API.
  */
 public interface CinderApi extends Closeable {
 
@@ -49,34 +48,34 @@ public interface CinderApi extends Closeable {
    Set<String> getConfiguredRegions();
 
    /**
-    * Provides synchronous access to {@link Extension} features.
+    * Provides access to {@link Extension} features.
     */
    @Delegate
-   ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
-    * Provides synchronous access to {@link Volume} features.
+    * Provides access to {@link Volume} features.
     */
    @Delegate
-   VolumeApi getVolumeApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   VolumeApi getVolumeApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
-    * Provides synchronous access to {@link VolumeType} features.
+    * Provides access to {@link VolumeType} features.
     */
    @Delegate
-   VolumeTypeApi getVolumeTypeApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   VolumeTypeApi getVolumeTypeApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
-    * Provides synchronous access to {@link Snapshot} features.
+    * Provides access to {@link Snapshot} features.
     */
    @Delegate
-   SnapshotApi getSnapshotApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   SnapshotApi getSnapshotApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
-    * Provides synchronous access to quota features.
+    * Provides access to quota features.
     */
    @Delegate
-   QuotaApi getQuotaApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   QuotaApi getQuotaApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * @return the Zone codes configured
@@ -88,43 +87,43 @@ public interface CinderApi extends Closeable {
    Set<String> getConfiguredZones();
 
    /**
-    * Provides synchronous access to Extension features.
+    * Provides access to Extension features.
     * @deprecated Please use {@link #getExtensionApi(String region)} as this method will be removed
     *             in jclouds 3.0.
     */
    @Deprecated
    @Delegate
    ExtensionApi getExtensionApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
-    * Provides synchronous access to Volume features.
+    * Provides access to Volume features.
     * @deprecated Please use {@link #getVolumeApi(String region)} as this method will be removed
     *             in jclouds 3.0.
     */
    @Deprecated
    @Delegate
    VolumeApi getVolumeApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
-    * Provides synchronous access to VolumeType features.
+    * Provides access to VolumeType features.
     * @deprecated Please use {@link #getVolumeTypeApi(String region)} as this method will be removed
     *             in jclouds 3.0.
     */
    @Deprecated
    @Delegate
    VolumeTypeApi getVolumeTypeApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
-    * Provides synchronous access to Snapshot features.
+    * Provides access to Snapshot features.
     * @deprecated Please use {@link #getSnapshotApi(String)} as this method will be removed
     *             in jclouds 3.0.
     */
    @Deprecated
    @Delegate
    SnapshotApi getSnapshotApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
 }
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
index 14807f3563..4c5be5b72e 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
@@ -43,7 +43,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
 import com.google.common.collect.FluentIterable;
 
 /**
- * Provides synchronous access to Volume Snapshots API.
+ * Provides access to Volume Snapshots API.
  *
  */
 @SkipEncoding({'/', '='})
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
index 68000a7130..c6d4d54370 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
@@ -43,7 +43,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
 import com.google.common.collect.FluentIterable;
 
 /**
- * Provides synchronous access to the Volume API.
+ * Provides access to the Volume API.
  *
  * This API strictly handles creating and managing Volumes. To attach a Volume to a Server you need to use the
  * @see VolumeAttachmentApi
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
index 9c5072e9cb..da59d8ba5b 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
@@ -36,7 +36,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
 import com.google.common.collect.FluentIterable;
 
 /**
- * Provides synchronous access to the OpenStack Block Storage (Cinder) v1 Volume Types API.
+ * Provides access to the OpenStack Block Storage (Cinder) v1 Volume Types API.
  *
  */
 @SkipEncoding({'/', '='})
diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java
index 7469ca1643..7b26dc5299 100644
--- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java
+++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java
@@ -17,7 +17,6 @@
 package org.jclouds.openstack.nova.ec2;
 
 import org.jclouds.ec2.EC2Api;
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
 import org.jclouds.openstack.nova.ec2.features.NovaEC2KeyPairApi;
 import org.jclouds.rest.annotations.Delegate;
@@ -26,7 +25,7 @@ import org.jclouds.rest.annotations.EndpointParam;
 import com.google.common.base.Optional;
 
 /**
- * Provides synchronous access to EC2 services.
+ * Provides access to EC2 services.
  */
 public interface NovaEC2Api extends EC2Api {
 
@@ -36,10 +35,10 @@ public interface NovaEC2Api extends EC2Api {
    @Delegate
    @Override
    Optional<? extends NovaEC2KeyPairApi> getKeyPairApi();
-   
+
    @Delegate
    @Override
    Optional<? extends NovaEC2KeyPairApi> getKeyPairApiForRegion(
-            @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) @Nullable String region);
+            @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) String region);
 
 }
diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java
index 5bfcaa4242..bf0a35e86c 100644
--- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java
+++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java
@@ -28,7 +28,6 @@ import org.jclouds.ec2.domain.KeyPair;
 import org.jclouds.ec2.features.KeyPairApi;
 import org.jclouds.ec2.functions.EncodedRSAPublicKeyToBase64;
 import org.jclouds.ec2.xml.KeyPairResponseHandler;
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
 import org.jclouds.rest.annotations.EndpointParam;
 import org.jclouds.rest.annotations.FormParams;
@@ -46,12 +45,12 @@ public interface NovaEC2KeyPairApi extends KeyPairApi {
     * this with CreateKeyPair, in which AWS creates the key pair and gives the keys to you (Nova
     * keeps a copy of the public key). With ImportKeyPair, you create the key pair and give Nova just
     * the public key. The private key is never transferred between you and Nova.
-    * 
+    *
     * <p/>
     * You can easily create an RSA key pair on Windows and Linux using the ssh-keygen command line
     * tool (provided with the standard OpenSSH installation). Standard library support for RSA key
     * pair creation is also available in Java, Ruby, Python, and many other programming languages.
-    * 
+    *
     * <p/>
     * <h4>Supported Formats</h4>
     * <ul>
@@ -63,7 +62,7 @@ public interface NovaEC2KeyPairApi extends KeyPairApi {
     * <p/>
     * Supported lengths: 1024, 2048, and 4096.
     * <p/>
-    * 
+    *
     * @param region
     *           region to import the key into
     * @param keyName
@@ -79,7 +78,7 @@ public interface NovaEC2KeyPairApi extends KeyPairApi {
    @FormParams(keys = ACTION, values = "ImportKeyPair")
    @XMLResponseParser(KeyPairResponseHandler.class)
    KeyPair importKeyPairInRegion(
-         @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) @Nullable String region,
+         @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) String region,
          @FormParam("KeyName") String keyName,
          @FormParam("PublicKeyMaterial") @ParamParser(EncodedRSAPublicKeyToBase64.class) String publicKeyMaterial);
 }
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
index 63fb5ab9cf..ecedb325c2 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
@@ -19,7 +19,6 @@ package org.jclouds.openstack.nova.v2_0;
 import java.io.Closeable;
 import java.util.Set;
 
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Region;
 import org.jclouds.location.functions.RegionToEndpoint;
 import org.jclouds.openstack.nova.v2_0.extensions.AvailabilityZoneApi;
@@ -66,25 +65,25 @@ public interface NovaApi extends Closeable {
     * Provides access to Server features.
     */
    @Delegate
-   ServerApi getServerApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   ServerApi getServerApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Flavor features.
     */
    @Delegate
-   FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Extension features.
     */
    @Delegate
-   ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Image features.
     */
    @Delegate
-   ImageApi getImageApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   ImageApi getImageApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Availability Zone features.
@@ -95,7 +94,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends AvailabilityZoneApi> getAvailabilityZoneApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Floating IP features.
@@ -106,7 +105,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends FloatingIPApi> getFloatingIPApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Security Group features.
@@ -117,7 +116,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends SecurityGroupApi> getSecurityGroupApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Key Pair features.
@@ -128,7 +127,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends KeyPairApi> getKeyPairApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Host Administration features.
@@ -139,7 +138,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends HostAdministrationApi> getHostAdministrationApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Simple Tenant Usage features.
@@ -150,7 +149,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Virtual Interface features.
@@ -161,7 +160,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends VirtualInterfaceApi> getVirtualInterfaceApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Server Extra Data features.
@@ -172,7 +171,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Server Admin Actions features.
@@ -183,7 +182,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends ServerAdminApi> getServerAdminApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Aggregate features.
@@ -194,7 +193,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends HostAggregateApi> getHostAggregateApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Flavor extra specs features.
@@ -205,7 +204,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Quota features.
@@ -216,7 +215,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends QuotaApi> getQuotaApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Volume features.
@@ -227,7 +226,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends VolumeApi> getVolumeApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Volume Attachment features.
@@ -238,7 +237,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends VolumeAttachmentApi> getVolumeAttachmentApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Volume Type features.
@@ -249,7 +248,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends VolumeTypeApi> getVolumeTypeApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Console features.
@@ -260,7 +259,7 @@ public interface NovaApi extends Closeable {
     */
    @Delegate
    Optional<? extends ConsolesApi> getConsolesApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * @return the Zone codes configured
@@ -278,7 +277,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    ServerApi getServerApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Flavor features.
@@ -287,7 +286,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    FlavorApi getFlavorApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Extension features.
@@ -297,7 +296,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    ExtensionApi getExtensionApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Image features.
@@ -307,7 +306,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    ImageApi getImageApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Floating IP features.
@@ -317,7 +316,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends FloatingIPApi> getFloatingIPExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Security Group features.
@@ -327,7 +326,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends SecurityGroupApi> getSecurityGroupExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Key Pair features.
@@ -337,7 +336,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends KeyPairApi> getKeyPairExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Host Administration features.
@@ -347,7 +346,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends HostAdministrationApi> getHostAdministrationExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Simple Tenant Usage features.
@@ -357,7 +356,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Virtual Interface features.
@@ -367,7 +366,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends VirtualInterfaceApi> getVirtualInterfaceExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Server Extra Data features.
@@ -377,7 +376,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Server Admin Actions features.
@@ -387,7 +386,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends ServerAdminApi> getServerAdminExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Aggregate features.
@@ -397,7 +396,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends HostAggregateApi> getHostAggregateExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Flavor extra specs features.
@@ -407,7 +406,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Quota features.
@@ -417,7 +416,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends QuotaApi> getQuotaExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Volume features.
@@ -427,7 +426,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends VolumeApi> getVolumeExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Volume Attachment features.
@@ -437,7 +436,7 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends VolumeAttachmentApi> getVolumeAttachmentExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Volume Type features.
@@ -447,15 +446,15 @@ public interface NovaApi extends Closeable {
    @Deprecated
    @Delegate
    Optional<? extends VolumeTypeApi> getVolumeTypeExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
-    * Provides synchronous access to Console features.
+    * Provides access to Console features.
     * @deprecated Please use {@link #getConsolesApi(String region)} as this method will be removed
     *             in jclouds 3.0.
     */
    @Deprecated
    @Delegate
    Optional<? extends ConsolesApi> getConsolesExtensionForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 }
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
index 332527d920..563117b27e 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
@@ -22,7 +22,6 @@ import java.util.Set;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Region;
 import org.jclouds.location.functions.RegionToEndpoint;
 import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
@@ -54,20 +53,20 @@ public interface TroveApi extends Closeable {
     * Provides access to Flavor features.
     */
    @Delegate
-   FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Instance features.
     */
    @Delegate
-   InstanceApi getInstanceApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   InstanceApi getInstanceApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to User features.
     */
    @Delegate
    @Path("/instances/{instanceId}")
-   UserApi getUserApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+   UserApi getUserApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
          @PathParam("instanceId") String instanceId);
 
    /**
@@ -75,7 +74,7 @@ public interface TroveApi extends Closeable {
     */
    @Delegate
    @Path("/instances/{instanceId}")
-   DatabaseApi getDatabaseApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+   DatabaseApi getDatabaseApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
          @PathParam("instanceId") String instanceId);
 
    /**
@@ -98,7 +97,7 @@ public interface TroveApi extends Closeable {
    @Deprecated
    @Delegate
    FlavorApi getFlavorApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Instance features.
@@ -108,7 +107,7 @@ public interface TroveApi extends Closeable {
    @Deprecated
    @Delegate
    InstanceApi getInstanceApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to User features.
@@ -118,7 +117,7 @@ public interface TroveApi extends Closeable {
    @Deprecated
    @Delegate
    @Path("/instances/{instanceId}")
-   UserApi getUserApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone,
+   UserApi getUserApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) String zone,
          @PathParam("instanceId") String instanceId);
 
    /**
@@ -129,7 +128,7 @@ public interface TroveApi extends Closeable {
    @Deprecated
    @Delegate
    @Path("/instances/{instanceId}")
-   DatabaseApi getDatabaseApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone,
+   DatabaseApi getDatabaseApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) String zone,
          @PathParam("instanceId") String instanceId);
 
    /**
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
index 090c42ffb7..e1446886a5 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
@@ -22,7 +22,6 @@ import java.util.Set;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
-import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Region;
 import org.jclouds.location.functions.RegionToEndpoint;
 import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi;
@@ -58,7 +57,7 @@ public interface CloudLoadBalancersApi extends Closeable {
     */
    @Delegate
    LoadBalancerApi getLoadBalancerApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+         @EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * Provides access to Node features.
@@ -66,7 +65,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    NodeApi getNodeApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Access Rule features.
@@ -74,7 +73,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    AccessRuleApi getAccessRuleApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Virtual IP features.
@@ -82,7 +81,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    VirtualIPApi getVirtualIPApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Connection features.
@@ -90,7 +89,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ConnectionApi getConnectionApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Health Monitor features.
@@ -98,7 +97,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    HealthMonitorApi getHealthMonitorApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Session Persistence features.
@@ -106,7 +105,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    SessionPersistenceApi getSessionPersistenceApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Content Caching features.
@@ -114,7 +113,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ContentCachingApi getContentCachingApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to SSL Termination features.
@@ -122,7 +121,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    SSLTerminationApi getSSLTerminationApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Error Page features.
@@ -130,13 +129,13 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ErrorPageApi getErrorPageApi(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Report features.
     */
    @Delegate
-   ReportApi getReportApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+   ReportApi getReportApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
 
    /**
     * @return the Zone codes configured
@@ -154,7 +153,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Deprecated
    @Delegate
    LoadBalancerApi getLoadBalancerApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 
    /**
     * Provides access to Node features.
@@ -165,7 +164,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    NodeApi getNodeApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Access Rule features.
@@ -176,7 +175,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    AccessRuleApi getAccessRuleApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Virtual IP features.
@@ -187,7 +186,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    VirtualIPApi getVirtualIPApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Connection features.
@@ -198,7 +197,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ConnectionApi getConnectionApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Health Monitor features.
@@ -209,7 +208,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    HealthMonitorApi getHealthMonitorApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Session Persistence features.
@@ -220,7 +219,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    SessionPersistenceApi getSessionPersistenceApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Content Caching features.
@@ -231,7 +230,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ContentCachingApi getContentCachingApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to SSL Termination features.
@@ -242,7 +241,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    SSLTerminationApi getSSLTerminationApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Error Page features.
@@ -253,7 +252,7 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Delegate
    @Path("/loadbalancers/{lbId}")
    ErrorPageApi getErrorPageApiForZoneAndLoadBalancer(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
 
    /**
     * Provides access to Report features.
@@ -262,5 +261,5 @@ public interface CloudLoadBalancersApi extends Closeable {
    @Deprecated
    @Delegate
    ReportApi getReportApiForZone(
-         @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone);
+         @EndpointParam(parser = RegionToEndpoint.class) String zone);
 }