diff --git a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
index 764f2e84ead..a38e1683f7e 100644
--- a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
@@ -29,7 +29,7 @@ import com.cloud.user.Account;
 import com.cloud.user.SSHKeyPair;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Create a new keypair and returns the private key", responseObject=SSHKeyPairResponse.class, includeInApiDoc=false) 
+@Implementation(description="Create a new keypair and returns the private key", responseObject=SSHKeyPairResponse.class) 
 public class CreateSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
     private static final String s_name = "createkeypairresponse";
diff --git a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
index a28422fd9a7..21fbe8e83d0 100644
--- a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
@@ -28,7 +28,7 @@ import com.cloud.api.response.SuccessResponse;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Deletes a keypair by name", responseObject=SuccessResponse.class, includeInApiDoc=false) 
+@Implementation(description="Deletes a keypair by name", responseObject=SuccessResponse.class) 
 public class DeleteSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
     private static final String s_name = "deletekeypairresponse";
diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java
index 5df5a24f73f..bea7e431721 100644
--- a/api/src/com/cloud/api/commands/DeployVMCmd.java
+++ b/api/src/com/cloud/api/commands/DeployVMCmd.java
@@ -98,7 +98,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
     @Parameter(name=ApiConstants.USER_DATA, type=CommandType.STRING, description="an optional binary data that can be sent to the virtual machine upon a successful deployment. This binary data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. Using HTTP GET (via querystring), you can send up to 2KB of data after base64 encoding.")
     private String userData;
 
-    @Parameter(name=ApiConstants.SSH_KEYPAIR, type=CommandType.STRING, description="name of the ssh key pair used to login to the virtual machine", includeInApiDoc=false)
+    @Parameter(name=ApiConstants.SSH_KEYPAIR, type=CommandType.STRING, description="name of the ssh key pair used to login to the virtual machine")
     private String sshKeyPairName;
 
     @Parameter(name=ApiConstants.HOST_ID, type=CommandType.LONG, description="destination Host ID to deploy the VM to - parameter available for root admin only")
diff --git a/api/src/com/cloud/api/commands/GetVMPasswordCmd.java b/api/src/com/cloud/api/commands/GetVMPasswordCmd.java
index 9264241b44e..b80f303ffed 100644
--- a/api/src/com/cloud/api/commands/GetVMPasswordCmd.java
+++ b/api/src/com/cloud/api/commands/GetVMPasswordCmd.java
@@ -30,7 +30,7 @@ import com.cloud.api.response.GetVMPasswordResponse;
 import com.cloud.user.Account;
 import com.cloud.uservm.UserVm;
 
-@Implementation(responseObject=GetVMPasswordResponse.class, description="Returns an encrypted password for the VM", includeInApiDoc=false)
+@Implementation(responseObject=GetVMPasswordResponse.class, description="Returns an encrypted password for the VM")
 public class GetVMPasswordCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GetVMPasswordCmd.class.getName());
     private static final String s_name = "getvmpasswordresponse";
diff --git a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java b/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
index 3a0655b7688..8871e572bea 100644
--- a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
+++ b/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
@@ -31,7 +31,7 @@ import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.SSHKeyPairResponse;
 import com.cloud.user.SSHKeyPair;
 
-@Implementation(description="List registered keypairs", responseObject=SSHKeyPairResponse.class, includeInApiDoc=false) 
+@Implementation(description="List registered keypairs", responseObject=SSHKeyPairResponse.class) 
 public class ListSSHKeyPairsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListSSHKeyPairsCmd.class.getName());
     private static final String s_name = "listsshkeypairsresponse";
diff --git a/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
index f28f994c885..b7c5945c1a4 100644
--- a/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
@@ -29,7 +29,7 @@ import com.cloud.user.Account;
 import com.cloud.user.SSHKeyPair;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Register a public key in a keypair under a certain name", responseObject=SSHKeyPairResponse.class, includeInApiDoc=false) 
+@Implementation(description="Register a public key in a keypair under a certain name", responseObject=SSHKeyPairResponse.class) 
 public class RegisterSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RegisterSSHKeyPairCmd.class.getName());
     private static final String s_name = "registerkeypairresponse";