diff --git a/includes/shortcodes/class-wc-shortcode-change-password.php b/includes/shortcodes/class-wc-shortcode-change-password.php
deleted file mode 100644
index b8301d5ec38..00000000000
--- a/includes/shortcodes/class-wc-shortcode-change-password.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Change Password Shortcode
- *
- * @author 		WooThemes
- * @category 	Shortcodes
- * @package 	WooCommerce/Shortcodes/Change_Password
- * @version     2.0.0
- */
-class WC_Shortcode_Change_Password {
-
-	/**
-	 * Get the shortcode content.
-	 *
-	 * @access public
-	 * @param array $atts
-	 * @return string
-	 */
-	public static function get( $atts ) {
-		return WC_Shortcodes::shortcode_wrapper( array( __CLASS__, 'output' ), $atts );
-	}
-
-	/**
-	 * Output the shortcode.
-	 *
-	 * @access public
-	 * @param array $atts
-	 * @return void
-	 */
-	public static function output( $atts ) {
-
-		if ( ! is_user_logged_in() ) return;
-
-		wc_get_template( 'myaccount/form-change-password.php' );
-	}
-}
\ No newline at end of file
diff --git a/templates/myaccount/form-change-password.php b/templates/myaccount/form-change-password.php
deleted file mode 100644
index 12e090417a9..00000000000
--- a/templates/myaccount/form-change-password.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Change password form
- *
- * @author 		WooThemes
- * @package 	WooCommerce/Templates
- * @version     1.6.4
- */
-
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-
-global $woocommerce;
-?>
-
-<?php wc_print_notices(); ?>
-
-<form action="<?php echo esc_url( get_permalink( wc_get_page_id( 'change_password' ) ) ); ?>" method="post">
-
-	<p class="form-row form-row-first">
-		<label for="password_1"><?php _e( 'New password', 'woocommerce' ); ?> <span class="required">*</span></label>
-		<input type="password" class="input-text" name="password_1" id="password_1" />
-	</p>
-	<p class="form-row form-row-last">
-		<label for="password_2"><?php _e( 'Re-enter new password', 'woocommerce' ); ?> <span class="required">*</span></label>
-		<input type="password" class="input-text" name="password_2" id="password_2" />
-	</p>
-	<div class="clear"></div>
-
-	<p><input type="submit" class="button" name="change_password" value="<?php _e( 'Save', 'woocommerce' ); ?>" /></p>
-
-	<?php wp_nonce_field( 'woocommerce-change_password' ); ?>
-	<input type="hidden" name="action" value="change_password" />
-
-</form>
\ No newline at end of file