diff --git a/www/static/.htaccess b/www/static/.htaccess
index 8d1f9aeca2..a6a21297d4 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -13,17 +13,6 @@ redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-refe
 # Redirect config reference precisely
 redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /juno/config-reference/content/list-of-compute-config-options.html
 
-# Redirect the Clients Guide to new End User Guide 
-redirect 301 /cli/quick-start/content/keystone_client.html /user-guide/content/keystone_commands.html
-redirect 301 /cli/quick-start/content/glance_client.html /user-guide/content/glance_commands.html
-redirect 301 /cli/quick-start/content/cinder_client.html /user-guide/content/cinder_commands.html
-redirect 301 /cli/quick-start/content/nova_client.html /user-guide/content/nova_commands.html
-redirect 301 /cli/quick-start/content/swift_client.html /user-guide/content/swift_commands.html
-redirect 301 /cli/quick-start/content/quantum_client.html /user-guide/content/neutron_commands.html
-redirect 301 /cli/quick-start/content/authenticate.html /user-guide/content/cli_openrc.html
-redirect 301 /cli/quick-start/content/prereq_software.html /user-guide/content/install_clients.html
-redirect 301 /cli/quick-start/content/ /user-guide/content/
-
 # Redirecting End-of-Life (EOL) versions, see https://wiki.openstack.org/wiki/Releases:
 redirectmatch 301 /bexar/.*$ /index.html
 redirectmatch 301 /cactus/.*$ /index.html
@@ -66,13 +55,6 @@ redirect 301 /security-guide/content/ssl-proxies-and-http-services.html /securit
 # Redirecting API Programming with Compute API to API Quick Start
 redirectmatch 301 /api/openstack-compute/programmer/content/.*$ /api/quick-start/content/
 
-# Redirect CLI Guide to new End User Guide
-redirectmatch 301 /trunk/cli/quick-start/content/.*$ /user-guide/content/
-
-# Redirecting removed pages from the user guide
-redirect 301 /user-guide/content/dashboard_launch_instances_from_volume.html /user-guide/content/dashboard_launch_instances_from_image.html
-redirect 301 /user-guide/content/nova_cli_evacuate.html /user-guide-admin/content/nova_cli_evacuate.html
-
 # Redirect docs.openstack.org index.html subpage pointers to main page
 redirect 301 /install/ /
 redirect 301 /basic-install/ /
@@ -153,14 +135,14 @@ redirectmatch 301 /openstack-network/.*$ /index.html
 redirect 301 /user-guide/content/app_community_support.html /user-guide/common/app_support.html
 redirect 301 /user-guide/content/checking_version_cli.html /user-guide/common/cli_discover_version_number_for_a_client.html
 redirect 301 /user-guide/content/install_clients.html /user-guide/common/cli_install_openstack_command_line_clients.html
-redirect 301 /user-guide/content/ssh-into-instance.html /user-guide/enduser/dashboard_launch_instances.html#connect-to-your-instance-by-using-ssh
+redirect 301 /user-guide/content/ssh-into-instance.html /user-guide/dashboard_launch_instances.html#connect-to-your-instance-by-using-ssh
 redirect 301 /user-guide/content/app_cheat_sheet.html /user-guide/cli_cheat_sheet.html
-redirect 301 /user-guide/content/Launching_Instances_using_Dashboard.html /user-guide/enduser/dashboard_launch_instances.html
+redirect 301 /user-guide/content/Launching_Instances_using_Dashboard.html /user-guide/dashboard_launch_instances.html
 
 # Redirect top ten (or so) Admin User Guide pages post-migration
-redirect 301 /user-guide-admin/content/admin_cli_manage_projects_users.html /user-guide-admin/adminuser/manage_projects_users_and_roles.html
-redirect 301 /user-guide-admin/content/specify-host-to-boot-instances-on.html /user-guide-admin/adminuser/cli_nova_specify_host.html
-redirect 301 /user-guide-admin/content/nova_cli_migrate_single.html /user-guide-admin/adminuser/cli_nova_migrate.html
+redirect 301 /user-guide-admin/content/admin_cli_manage_projects_users.html /user-guide-admin/manage_projects_users_and_roles.html
+redirect 301 /user-guide-admin/content/specify-host-to-boot-instances-on.html /user-guide-admin/cli_nova_specify_host.html
+redirect 301 /user-guide-admin/content/nova_cli_migrate_single.html /user-guide-admin/cli_nova_migrate.html
 
 # Since we don't have a direct match for all file, redirect to the index page.