diff --git a/src/im_mad/im_exec/one_im_sh_ec2 b/src/im_mad/im_exec/one_im_sh_ec2
deleted file mode 100644
index cd4d386a3f..0000000000
--- a/src/im_mad/im_exec/one_im_sh_ec2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-if [ -z "${ONE_LOCATION}" ]; then
-    MAD_LOCATION=/usr/lib/one/mads
-else
-    MAD_LOCATION=$ONE_LOCATION/lib/mads
-fi
-
-while getopts ":u:r:t:c" opt $@; do
-  case "${opt}" in
-    u)
-        export EC2_REGION="${OPTARG}"
-        ;;
-    *)
-        ;;
-  esac
-done
-
-exec $MAD_LOCATION/one_im_sh $*
diff --git a/src/vmm_mad/exec/one_vmm_sh_ec2 b/src/vmm_mad/exec/one_vmm_sh_ec2
deleted file mode 100644
index 0ba57b93c5..0000000000
--- a/src/vmm_mad/exec/one_vmm_sh_ec2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-if [ -z "${ONE_LOCATION}" ]; then
-    MAD_LOCATION=/usr/lib/one/mads
-else
-    MAD_LOCATION=$ONE_LOCATION/lib/mads
-fi
-
-while getopts ":u:r:t:l:s:" opt $@; do
-  case "${opt}" in
-    u)
-        export EC2_REGION="${OPTARG}"
-        ;;
-    *)
-        ;;
-  esac
-done
-
-exec $MAD_LOCATION/one_vmm_sh $*
diff --git a/src/vmm_mad/remotes/ec2/hybrid_ec2.conf b/src/vmm_mad/remotes/ec2/ec2_driver.conf
similarity index 100%
rename from src/vmm_mad/remotes/ec2/hybrid_ec2.conf
rename to src/vmm_mad/remotes/ec2/ec2_driver.conf
diff --git a/src/vmm_mad/remotes/ec2/ec2.conf b/src/vmm_mad/remotes/ec2/ec2_driver.default
similarity index 87%
rename from src/vmm_mad/remotes/ec2/ec2.conf
rename to src/vmm_mad/remotes/ec2/ec2_driver.default
index a8272d6237..95673cffbe 100644
--- a/src/vmm_mad/remotes/ec2/ec2.conf
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.default
@@ -16,19 +16,19 @@
 <!--
  Default configuration attributes for the EC2 driver
  (all domains will use these values as defaults)
- Valid atributes are:
-   - ec2[keypair,authorizedports,instancetype]
+ Valid atributes are: AKI AMI CLIENTTOKEN INSTANCETYPE KEYPAIR LICENSEPOOL
+    PLACEMENTGROUP PRIVATEIP RAMDISK SUBNETID TENANCY USERDATA SECURITYGROUPS
+    AVAILABILITYZONE EBS_OPTIMIZED ELASTICIP AUTHORIZEDPORTS TAGS
  Use XML syntax to specify defaults, note elements are UPCASE
  Example:
  <TEMPLATE>
    <EC2>
      <KEYPAIR>gsg-keypair</KEYPAIR>
-     <AUTHORIZEDPORTS>22</AUTHORIZEDPORTS>
      <INSTANCETYPE>m1.small</INSTANCETYPE>
    </EC2>
  </TEMPLATE>
 -->
- 
+
 <TEMPLATE>
   <EC2>
     <INSTANCETYPE>m1.small</INSTANCETYPE>
diff --git a/src/vmm_mad/remotes/ec2/ec2rc b/src/vmm_mad/remotes/ec2/ec2rc
deleted file mode 100644
index 0d1e5841db..0000000000
--- a/src/vmm_mad/remotes/ec2/ec2rc
+++ /dev/null
@@ -1,41 +0,0 @@
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-# May be needed in some setups
-#CLASSPATH: ""
-#JAVA_HOME: ""
-
-#----------------------------------------------------------------------------
-# EC2 API TOOLS Configuration.
-#----------------------------------------------------------------------------
-#EC2_HOME: "<path_to_ec2_utils>"
-#EC2_PRIVATE_KEY: "<path_to_your_ec2_pem_key>"
-#EC2_CERT: "<path_to_your_ec2_pem_cert>"
-
-#----------------------------------------------------------------------------
-# Driver configuration
-#----------------------------------------------------------------------------
-# Arguments for the JAVA Virtual Machine
-EC2_JVM_ARGS: "-Xms16m -Xmx64m"
-
-#----------------------------------------------------------------------------
-# Max number of instances that can be launched into EC2
-#----------------------------------------------------------------------------
-
-SMALL_INSTANCES:        5
-LARGE_INSTANCES:        0
-EXTRALARGE_INSTANCES:   0
-