diff --git a/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst b/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst
index 94a34c35..9f3a3f4b 100644
--- a/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst
+++ b/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst
@@ -28,7 +28,7 @@ Preliminary steps
 
    .. note::
 
-      ``<release-number>`` is the latest |CL| auto-numbered release.
+      <release-number> is the latest |CL| auto-numbered release.
 
 #. Follow your OS instructions to create a bootable USB drive.
 
@@ -48,11 +48,11 @@ USB drive, follow these steps.
 
 #. Power on the system.
 
-#. Open the system BIOS setup menu by pressing the F2 key.
+#. Open the system BIOS setup menu by pressing the :kbd:`F2` key.
 
    .. note::
 
-    Your BIOS setup menu entry point may vary.
+      Your BIOS setup menu entry point may vary.
 
 #. In the setup menu, enable the UEFI boot and set the USB drive as the
    first option in the device boot order.
@@ -69,18 +69,18 @@ Launch the installer
 #. Select the icon, :guilabel:`Install Clear Linux OS`, shown in Figure 1.
 
    .. figure:: figures/bare-metal-install-beta-1.png
-     :scale: 50 %
-     :alt: Install Clear Linux OS icon
+      :scale: 50 %
+      :alt: Install Clear Linux OS icon
 
-     Figure 1: Install Clear Linux OS icon
+      Figure 1: Install Clear Linux OS icon
 
 #. Upon selecting the icon, the installer is launched, as shown in Figure 2.
 
    .. figure:: figures/bare-metal-install-beta-2.png
-     :scale: 50 %
-     :alt: Clear Linux OS Installer
+      :scale: 50 %
+      :alt: Clear Linux OS Installer
 
-     Figure 2: Clear Linux OS Installer
+      Figure 2: Clear Linux OS Installer
 
 .. _minimum-installation-requirements:
 
@@ -108,10 +108,10 @@ Main Menu
 The |CL| Installer Main Menu appears as shown in Figure 3.
 
 .. figure:: figures/bare-metal-install-beta-3.png
-   :scale: 100 %
+   :scale: 100%
    :alt: Clear Linux OS Installer Main Menu
 
-   Figure 3: :guilabel:`Clear Linux OS Installer Main Menu`
+   Figure 3: Clear Linux OS Installer Main Menu
 
 The |CL| Installer Main Menu has two tabs: :guilabel:`[R] Required options`
 and :guilabel:`[A] Advanced options`. Navigate between tabs using the arrow
@@ -158,10 +158,10 @@ Choose Timezone
       return to the Main Menu.
 
    .. figure:: figures/bare-metal-install-beta-4.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Select System Timezone
 
-      Figure 4: :guilabel:`Select System Timezone`
+      Figure 4: Select System Timezone
 
 Choose Language
 ===============
@@ -181,10 +181,10 @@ Choose Language
       Select :guilabel:`Cancel` to restore the previously defined value and return to the Main Menu.
 
    .. figure:: figures/bare-metal-install-beta-5.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Select System Language
 
-      Figure 5: :guilabel:`Select System Language`
+      Figure 5: Select System Language
 
 
 Configure the Keyboard
@@ -208,10 +208,10 @@ Configure the Keyboard
       Select :guilabel:`Cancel` to restore the previously defined value and return to the Main Menu.
 
    .. figure:: figures/bare-metal-install-beta-6.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Select Keyboard menu
 
-      Figure 6: :guilabel:`Select Keyboard menu`
+      Figure 6: Select Keyboard menu
 
 Configure Media
 ===============
@@ -225,10 +225,10 @@ Configure Media
 #. Navigate to the desired media until highlighted.
 
    .. figure:: figures/bare-metal-install-beta-7.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Configure Media menu
 
-      Figure 7: :guilabel:`Configure Media menu`
+      Figure 7: Configure Media menu
 
       .. note::
 
@@ -271,10 +271,10 @@ Auto partition will configure the media to meet the minimum requirements.
    This action returns you to the Main Menu.
 
    .. figure:: figures/bare-metal-install-beta-8.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Auto Partition
 
-      Figure 8: :guilabel:`Auto Partition`
+      Figure 8: Auto Partition
 
 #. You may skip to the :ref:`telemetry-tui` section below.
 
@@ -349,10 +349,10 @@ boot partition
 #. Select :guilabel:`Enter` to confirm.
 
    .. figure:: figures/bare-metal-install-beta-9.png
-      :scale: 100 %
+      :scale: 100%
       :alt: boot partition
 
-      Figure 9: :guilabel:`boot partition`
+      Figure 9: boot partition
 
 swap partition
 --------------
@@ -373,10 +373,10 @@ swap partition
 #. Select :guilabel:`Enter` to continue.
 
    .. figure:: figures/bare-metal-install-beta-10.png
-      :scale: 100 %
+      :scale: 100%
       :alt: swap partition
 
-      Figure 10: :guilabel:`swap partition`
+      Figure 10: swap partition
 
 .. _encrypt-root:
 
@@ -389,10 +389,10 @@ root partition
    #. Optional: Select :guilabel:`[X] Encrypt` to encrypt the partition.
 
       .. figure:: figures/bare-metal-install-beta-11.png
-         :scale: 100 %
+         :scale: 100%
          :alt: Encrypt partition
 
-         Figure 11: :guilabel:`Encrypt partition`
+         Figure 11: Encrypt partition
 
 
    #. The :guilabel:`Encryption Passphrase` dialogue appears.
@@ -402,10 +402,10 @@ root partition
          Minimum length is 8 characters. Maximum length is 94 characters.
 
       .. figure:: figures/bare-metal-install-beta-12.png
-         :scale: 100 %
+         :scale: 100%
          :alt: Encryption Passphrase
 
-         Figure 12: :guilabel:`Encryption Passphrase`
+         Figure 12: Encryption Passphrase
 
    #. Enter the same passphrase in the first and second field.
 
@@ -438,10 +438,10 @@ root partition
    should be similar to those shown in Figure 13.
 
    .. figure:: figures/bare-metal-install-beta-13.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Partitions
 
-      Figure 13: :guilabel:`Partitions`
+      Figure 13: Partitions
 
 #. Navigate to :guilabel:`Confirm` until highlighted.
 
@@ -465,10 +465,10 @@ For more detailed information, visit our :ref:`telemetry-about` page.
 #. Select :kbd:`Enter` to confirm.
 
    .. figure:: figures/bare-metal-install-beta-14.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Enable Telemetry
 
-      Figure 14: :guilabel:`Enable Telemetry`
+      Figure 14: Enable Telemetry
 
 Skip to finish installation
 ===========================
@@ -511,10 +511,10 @@ interface settings are automatically applied.
    .. note:: Multiple network interfaces may appear.
 
    .. figure:: figures/bare-metal-install-beta-15.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Configure Network Interfaces
 
-      Figure 15: :guilabel:`Configure Network Interfaces`
+      Figure 15: Configure Network Interfaces
 
 #. Notice :guilabel:`Automatic / dhcp` is selected by default (at bottom).
 
@@ -522,10 +522,10 @@ interface settings are automatically applied.
    :kbd:`Spacebar` to deselect.
 
    .. figure:: figures/bare-metal-install-beta-16.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Network interface configuration
 
-      Figure 16: :guilabel:`Network interface configuration`
+      Figure 16: Network interface configuration
 
 #. Navigate to the appropriate fields and assign the desired
    network configuration.
@@ -562,10 +562,10 @@ instruction.
 #. Navigate to the field :guilabel:`HTTPS Proxy`.
 
    .. figure:: figures/bare-metal-install-beta-17.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Configure the network proxy
 
-      Figure 17: :guilabel:`Configure the network proxy`
+      Figure 17: Configure the network proxy
 
 #. Enter the desired proxy address and port using conventional syntax,
    such as: \http://address:port.
@@ -588,10 +588,10 @@ select :guilabel:`Test Network Settings` and select :guilabel:`Enter`.
 A progress bar appears as shown in Figure 18.
 
 .. figure:: figures/bare-metal-install-beta-18.png
-   :scale: 100 %
+   :scale: 100%
    :alt: Testing Networking dialogue
 
-   Figure 18: :guilabel:`Testing Networking dialogue`
+   Figure 18: Testing Networking dialogue
 
 .. note::
 
@@ -610,10 +610,10 @@ Bundle Selection
 #. Select :kbd:`Spacebar` to select the checkbox for each desired bundle.
 
    .. figure:: figures/bare-metal-install-beta-19.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Bundle Selection
 
-      Figure 19: :guilabel:`Bundle Selection`
+      Figure 19: Bundle Selection
 
 #. Select :kbd:`Confirm` or :kbd:`Cancel`.
 
@@ -632,10 +632,10 @@ Add New User
 #. Select :guilabel:`Add New User` as shown in Figure 20.
 
    .. figure:: figures/bare-metal-install-beta-20.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Add New User, User Name
 
-      Figure 20: :guilabel:`Add New User`
+      Figure 20: Add New User
 
 #. Optional: Enter a :guilabel:`User Name`.
 
@@ -644,10 +644,10 @@ Add New User
       The User Name must be alphanumeric and can include spaces, commas, or hyphens. Maximum length is 64 characters.
 
    .. figure:: figures/bare-metal-install-beta-21.png
-      :scale: 100 %
+      :scale: 100%
       :alt: User Name
 
-      Figure 21: :guilabel:`User Name`
+      Figure 21: User Name
 
 #. Enter a :guilabel:`Login`.
 
@@ -659,7 +659,7 @@ Add New User
 
    .. note:
 
-       Minimum length is 8 characters. Maximum length is 255 characters.
+      Minimum length is 8 characters. Maximum length is 255 characters.
 
 #. In :guilabel:`Retype`, enter the same password.
 
@@ -671,10 +671,10 @@ Add New User
       Selecting this option enables sudo privileges for the user.
 
    .. figure:: figures/bare-metal-install-beta-22.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Administrative rights
 
-      Figure 22: :guilabel:`Administrative rights`
+      Figure 22: Administrative rights
 
 #. Select :kbd:`Confirm`.
 
@@ -695,10 +695,10 @@ Modify / Delete User
 #. Select :kbd:`Enter` to modify the user.
 
    .. figure:: figures/bare-metal-install-beta-23.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Modify User
 
-      Figure 23: :guilabel:`Modify User`
+      Figure 23: Modify User
 
 #. Modify user details as desired.
 
@@ -733,10 +733,10 @@ new kernel.
 #. To add or remove arguments, choose one of the following options.
 
    .. figure:: figures/bare-metal-install-beta-24.png
-      :scale: 100 %
+      :scale: 100%
       :alt: kernel command line
 
-      Figure 24: :guilabel:`kernel command line`
+      Figure 24: kernel command line
 
 #. To add arguments, enter the argument in :guilabel:`Add Extra Arguments`.
 
@@ -756,10 +756,10 @@ Kernel Selection
 #. To select a differnt kernel, navigate to it using :guilabel:`Tab`.
 
    .. figure:: figures/bare-metal-install-beta-25.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Kernel selection
 
-      Figure 25: :guilabel:`Kernel selection`
+      Figure 25: Kernel selection
 
 #. Select :kbd:`Spacebar` to select the desired option.
 
@@ -779,10 +779,10 @@ If you have your own custom mirror of |CL|, you can add its URL.
 #. Select :kbd:`Confirm`.
 
    .. figure:: figures/bare-metal-install-beta-26.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Swupd Mirror
 
-      Figure 26: :guilabel:`Swupd Mirror`
+      Figure 26: Swupd Mirror
 
 Optional: :ref:`Skip to finish installation <finish-cl-installation>`.
 
@@ -800,10 +800,10 @@ Assign Hostname
       63 characters.
 
    .. figure:: figures/bare-metal-install-beta-27.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Assign Hostname
 
-      Figure 27: :guilabel:`Assign Hostname`
+      Figure 27: Assign Hostname
 
 
 #. Navigate to :kbd:`Confirm` until highlighted.
@@ -823,10 +823,10 @@ follow the onscreen instructions.
 #. Select the desired option.
 
    .. figure:: figures/bare-metal-install-beta-28.png
-      :scale: 100 %
+      :scale: 100%
       :alt: Automatic OS Updates
 
-      Figure 28: :guilabel:`Automatic OS Updates`
+      Figure 28: Automatic OS Updates
 
 You are returned to the :guilabel:`Main Menu`.
 
@@ -840,7 +840,7 @@ Finish installation
 
    .. note::
 
-      Whenever installation is finished, a ``reboot`` button appears.
+      When installation is finished, a ``reboot`` button appears.
 
 #. Select ``reboot``.
 
@@ -850,6 +850,13 @@ Finish installation
 
 You have successfully installed |CL| on bare metal using the new installer.
 
+Next steps
+**********
+
+:ref:`enable-user-space`
+
+.. _incl-bare-metal-beta-end:
+
 .. _Navigate to the image directory: https://download.clearlinux.org/image/
 .. _Autoproxy: https://clearlinux.org/features/autoproxy
 .. _telemetry: https://clearlinux.org/features/telemetry
diff --git a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-20X.png b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-20X.png
deleted file mode 100644
index b3d1d42d..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-20X.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-3.png b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-3.png
index 22ef4a6d..21121e06 100644
Binary files a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-3.png and b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-3.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-4.png b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-4.png
index d995aedc..dcce7ec9 100644
Binary files a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-4.png and b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-4.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-5.png b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-5.png
index 6e41794c..dac8525d 100644
Binary files a/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-5.png and b/source/clear-linux/get-started/bare-metal-install-beta/figures/bare-metal-install-beta-5.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
index 560e56e3..5c377195 100644
--- a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
+++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
@@ -1,36 +1,46 @@
 .. _bare-metal-install:
 
-Install |CL-ATTR| on bare metal (automatic)
-###########################################
+Install |CL-ATTR| on bare metal
+###############################
 
 These instructions guide you through the installation of |CL-ATTR|
 on bare metal using a bootable USB drive.
 
-Before you begin, check that your system meets the requirements to install |CL|:
+.. contents::
+   :local:
+   :depth: 1
+
+System requirements
+*******************
+
+Assure that your target system supports the installation:
 
 * :ref:`system-requirements`
 * :ref:`compatibility-check`
 
-
 Download the latest |CL| installer image
 ****************************************
 
-Get the latest |CL| installer image from the `image`_ directory.
-Look for the :file:`clear-[version number]-installer.img.xz` file. You can also use this command:
+Get the latest |CL| installer image from the `downloads page`_. See Figure 1.
+Look for the :file:`clear-[version number]-installer.img.xz` file.
+
+.. figure:: figures/bare-metal-install-1.png
+   :scale: 50%
+   :alt: Visit Downloads
+
+   Figure 1: Visit Downloads
+
+Optionally, you can use this command:
 
 .. code-block:: bash
 
    curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep "installer")
 
-Once you have downloaded the image, verify and decompress the file.
+#. Follow your OS instructions to create a bootable USB drive.
 
-.. include:: ../../guides/maintenance/download-verify-decompress-linux.rst
-   :Start-after: incl-decompress-image:
-   :end-before: incl-decompress-image-end:
+   * :ref:`bootable-usb-beta-all`
 
-.. include:: ../bootable-usb/bootable-usb-linux.rst
-   :Start-after: copy-usb-linux:
-   :end-before: usb-next
+#. After downloading the image, verify and decompress the file per your OS.
 
 .. _install-on-target:
 
@@ -57,269 +67,18 @@ Follow these steps to install |CL| on the target system:
 
 #. Reboot the target system.
 
-#. The |CL| boot menu will start as shown in figure 1.
-   Select :guilabel:`Clear Linux OS` and press the
-   :kbd:`Enter` key or wait five seconds to automatically select it.
-
-   .. figure:: figures/bare-metal-install-1.png
-      :scale: 50 %
-      :alt: Boot menu
-
-      Figure 1: :guilabel:`Boot menu`
-
-#. This will take you into the |CL| installer menu as shown in figure 2 and explains how to
-   navigate through the |CL| installer setup menus.
+#. This action launches the |CL| installer boot menu, shown in figure 2.
 
    .. figure:: figures/bare-metal-install-2.png
-      :scale: 50 %
-      :alt: Installer menu
+      :scale: 50%
+      :alt: Clear Linux OS Installer boot menu
 
-      Figure 2: :guilabel:`Installer menu`
+      Figure 2: Clear Linux OS Installer boot menu
 
-   Press the :kbd:`Enter` key.
 
-#. The :guilabel:`Keyboard selection` menu shown in figure 3 allows you to set
-   up the keyboard layout that you will be using to navigate within the |CL|
-   installer setup menus.
+.. include:: ../bare-metal-install-beta/bare-metal-install-beta.rst
+   :start-after: minimum-installation-requirements:
+   :end-before: incl-bare-metal-beta-end:
 
-   .. figure:: figures/bare-metal-install-3.png
-      :scale: 50 %
-      :alt: Keyboard Selection
 
-      Figure 3: :guilabel:`Keyboard Selection`
-
-   For this guide we will select :menuselection:`Keyboard Selection -->
-   < * us >` for the keyboard mapping, which should already be highlighted.
-   Press the :kbd:`Enter` key to continue to the next menu.
-
-Network requirements
-====================
-
-The :guilabel:`Network Requirements` menu, the first step of the |CL|
-installer setup process, will attempt to connect to the |CL| update server
-where the installer image is located. Once the connection to the |CL| update
-server is established, you will see a screen similar to the one shown in
-figure 4.
-
-.. figure:: figures/bare-metal-install-4.png
-   :scale: 50 %
-   :alt: Network Requirements
-
-   Figure 4: :guilabel:`Network Requirements`
-
-If you need to configure any :guilabel:`Proxy Settings` to gain access to the
-update server, enter the appropriate address and port of your proxy server in
-the :guilabel:`HTTPS proxy:` field.  Select the :guilabel:`< Set proxy
-configuration >` button and press :kbd:`Enter`. You will then see the
-connection to the update server established.
-
-Optionally, set up a :guilabel:`static IP configuration` to your |CL|
-installer image.  Enter the required information in the :guilabel:`Interface`,
-:guilabel:`IP address`, :guilabel:`Subnet mask`, :guilabel:`Gateway` and
-:guilabel:`DNS` fields and then select the :guilabel:`< Set static IP
-configuration >` button and press the :kbd:`Enter` key.
-
-The information displayed in the lower right quadrant of the screen shows the
-current IP configuration for the |CL| update server where the installer image
-is located.
-
-.. note::
-
-   If you are having difficulty establishing a connection to the update server
-   and you see the message :guilabel:`none detected, install will fail`, you
-   can press the :kbd:`Tab` key to highlight the :guilabel:`< Refresh >`
-   button and press :kbd:`Enter` to attempt to reconnect to the |CL| update
-   server. If this fails to establish a connection after multiple attempts,
-   reboot your system and return to this step.
-
-Once the connection to the |CL| udpate server is established, use the
-:kbd:`Tab` key to advance to the :guilabel:`< Next >` button and press
-:kbd:`Enter` to advance to the next |CL| installer setup menu.
-
-Choose |CL| installer action
-============================
-
-The :guilabel:`Choose Action` menu is where you can choose to install, repair,
-open a shell, or exit the |CL| installer.  This menu is shown in figure 5.
-
-.. figure:: figures/bare-metal-install-5.png
-   :scale: 50 %
-   :alt: Choose Action
-
-   Figure 5: :guilabel:`Choose Action`
-
-#. Select the :menuselection:`Choose action --> Install` menu item to continue
-   the installation process.
-
-   The :menuselection:`Choose action --> Repair` menu option will run the
-   :command:`swupd --fix` command to correct any issues found with the system
-   software that has already been installed on your system and correct any
-   issues found by overwriting the incorrect file content, adding missing
-   files, fixing permissions and any additional changes required to return the
-   file to it's original content and permissions.
-
-   The :menuselection:`Choose action --> Shell` menu item opens a terminal
-   session on your system as the root user and you will be able to manage your
-   system from this console.  When you are finished, type :command:`exit` to
-   return to the :guilabel:`Choose Action` menu.
-
-   The :menuselection:`Choose action --> Exit` menu option terminates the |CL|
-   installation process and the system will shut down.
-
-#. You will be prompted to join the :guilabel:`Stability Enhancement Program`
-   as shown in figure 6. Press the :kbd:`Spacebar` or :kbd:`Enter` key until
-   the cursor appears in the :guilabel:`[ ] Yes.` button. Press tab to highlight :guilabel:`< Next >`, and select Enter to advance.
-
-   .. figure:: figures/bare-metal-install-6.png
-      :scale: 50 %
-      :alt: Stability Enhancement Program
-
-      Figure 6: :guilabel:`Stability Enhancement Program`
-
-   If you choose not to enable this functionality during this step, you can
-   install the ``telemetrics`` software bundle at a later time. As stated in
-   the menu, this feature only collects anonymous information about your
-   system to help improve system stability and no personally identifiable
-   information is collected. Please visit our website to
-   `learn more about telemetry.`_
-
-Choose |CL| installation type
-*****************************
-
-Figure 7 shows the next step of the |CL| installer:
-:guilabel:`Choose installation Type`. Chose whether to install |CL|
-**automatically** or **manually**.  To end the installer process and shut down
-the system, select the :guilabel:`< Exit >` button.
-
-.. figure:: figures/bare-metal-install-7.png
-   :scale: 50 %
-   :alt: Choose installation type
-
-   Figure 7: :guilabel:`Choose installation Type`
-
-If you select :guilabel:`< Automatic >` as the installation type, the |CL|
-Installer will add the minimum amount of functionality required for a fully
-functional |CL| system. You will not be able to modify the disk layout, add
-a user or any other tasks that the manual installation process will allow.
-
-With the :guilabel:`< Manual(Advanced) >` option, you can do the following
-additional tasks during |CL| Installer setup:
-
-* Modify the disk layout using the cgdisk utility.
-* Add additional command-line parameters to the kernel.
-* Create a hostname for your system.
-* Create an administrative user.
-* Add additional software bundles to enhance the functionality of your initial
-  |CL| installation.
-* Optionally, set up a static IP address for your system.
-
-If you want to perform any of these additional tasks, select the
-:guilabel:`< Manual(Advanced) >` menu item and follow the steps in our
-:ref:`bare-metal-manual-install` to complete the |CL| manual installation
-process. Otherwise, you can follow the |CL| automatic installation steps.
-
-|CL| automatic installation
-***************************
-
-#. To install the minimum components for your |CL| implementation, select the
-   :guilabel:`< Automatic >` menu item shown in figure 7 and press the
-   :kbd:`Enter` key.
-
-   The :guilabel:`Choose target device for installation` screen shown in figure 8 appears.
-
-#. Move the cursor to the desired target and press the :kbd:`Enter`
-   key.
-
-   .. figure:: figures/bare-metal-install-8.png
-      :scale: 50 %
-      :alt: Choose target device for installation
-
-   Figure 8: :guilabel:`Choose target device for installation`
-
-   In this example, we selected the single primary partition from our hard drive.
-
-   With all the |CL| installer setup information gathered for the automatic
-   installation option, the |CL| Installer prompts you to begin the actual
-   installation as shown in figure 9.
-
-   .. figure:: figures/bare-metal-install-9.png
-      :scale: 50 %
-      :alt: Begin installation
-
-   Figure 9: :guilabel:`Begin installation`
-
-#. When you are satisfied with the information you have entered, select the
-   :guilabel:`< Yes >` button and press :kbd:`Enter` to begin installing |CL|.
-
-   |CL| Installation begins and each step shows its status as it progresses
-   through the automated installation process.
-
-   Once all steps have completed, you will see the :guilabel:`Successful
-   installation` status message and the :guilabel:`< Ok >` button is highlighted as shown in figure 10.
-
-#. Press the :kbd:`Enter` key to continue.
-
-   .. figure:: figures/bare-metal-install-10.png
-      :scale: 50 %
-      :alt: Installation complete
-
-      Figure 10: :guilabel:`Installation complete`
-
-   Figure 11 shows the final installer screen, showing that the
-   installation completed successfully and the system will reboot.
-
-#. Press the :kbd:`Enter` key and remove the USB media while the system
-   restarts.
-
-   .. figure:: figures/bare-metal-install-11.png
-      :scale: 50 %
-      :alt: Successful installation
-
-      Figure 11: :guilabel:`Successful Installation`
-
-Set up your root account
-========================
-
-Once the |CL| installation is complete and the system boots, a full screen
-console requests your login as shown in figure 12:
-
-.. figure:: figures/bare-metal-install-12.png
-   :scale: 50 %
-   :alt: Login screen
-
-   Figure 12: :guilabel:`Login screen`
-
-#. At the initial login prompt, enter: ``root``
-
-#. Once prompted, enter a new password.
-
-#. Re-enter the password to verify it.
-
-You have now set your root password and are logged in with root privileges.
-
-**Congratulations!**
-
-You have successfully installed |CL| on a bare metal system using the
-automatic installation method and set the password for the ``root`` user.
-
-Next steps
-**********
-
-The automatic installation of |CL| is designed to install with minimal
-software overhead. Some housekeeping and package installations could be
-needed before you can take full advantage of the |CL| operating system.
-
-See the :ref:`enable-user-space` guide for additional information and
-instructions.
-
-
-.. _`information about stateless`:
-   https://clearlinux.org/features/stateless
-
-.. _`learn more about telemetry.`:
-   https://clearlinux.org/features/telemetry
-
-.. _`NUC6i5SYH product page`:
-   http://www.intel.com/content/www/us/en/nuc/nuc-kit-nuc6i5syh.html
-
-.. _image: https://download.clearlinux.org/image
+.. _downloads page: https://clearlinux.org/downloads
\ No newline at end of file
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png
index f38b5413..3b5f1d4e 100644
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-10.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-10.png
deleted file mode 100644
index b0cb9b0b..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-10.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-11.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-11.png
deleted file mode 100644
index b0cc483f..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-11.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-12.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-12.png
deleted file mode 100644
index 34e676a1..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-12.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png
index 94be46fe..2e94163e 100644
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-3.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-3.png
deleted file mode 100644
index 4f6c3bb3..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-3.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-4.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-4.png
deleted file mode 100644
index 1d4c4a50..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-4.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-5.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-5.png
deleted file mode 100644
index 217690c2..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-5.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-6.png
deleted file mode 100644
index 2d879976..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-6.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-7.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-7.png
deleted file mode 100644
index 9515eb20..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-7.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-8.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-8.png
deleted file mode 100644
index 0a0b3e25..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-8.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-9.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-9.png
deleted file mode 100644
index 35911d99..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-9.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-1.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-1.png
new file mode 100644
index 00000000..e3c8ff31
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-1.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-10.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-10.png
new file mode 100644
index 00000000..888b9c2a
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-10.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-11.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-11.png
new file mode 100644
index 00000000..9a6b61c7
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-11.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-12.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-12.png
new file mode 100644
index 00000000..89ca1936
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-12.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-13.png
new file mode 100644
index 00000000..6ac1f059
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-13.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-14.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-14.png
new file mode 100644
index 00000000..3e7fbb8a
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-14.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-15.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-15.png
new file mode 100644
index 00000000..1eaa499e
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-15.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-16.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-16.png
new file mode 100644
index 00000000..d2c2a031
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-16.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-17.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-17.png
new file mode 100644
index 00000000..7e1d6cc9
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-17.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-18.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-18.png
new file mode 100644
index 00000000..4948cbe6
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-18.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-19.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-19.png
new file mode 100644
index 00000000..720d06dd
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-19.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-2.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-2.png
new file mode 100644
index 00000000..d3d4cbb6
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-2.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-20.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-20.png
new file mode 100644
index 00000000..39f9a644
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-20.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-21.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-21.png
new file mode 100644
index 00000000..0ce16ab7
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-21.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-22.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-22.png
new file mode 100644
index 00000000..3a028f4e
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-22.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-23.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-23.png
new file mode 100644
index 00000000..f7fe354f
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-23.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-24.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-24.png
new file mode 100644
index 00000000..02a5cc26
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-24.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-25.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-25.png
new file mode 100644
index 00000000..e726b95e
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-25.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-26.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-26.png
new file mode 100644
index 00000000..9e1b42d5
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-26.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-27.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-27.png
new file mode 100644
index 00000000..14dec55a
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-27.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-28.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-28.png
new file mode 100644
index 00000000..4e3acf29
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-28.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-3.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-3.png
new file mode 100644
index 00000000..21121e06
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-3.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-4.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-4.png
new file mode 100644
index 00000000..dcce7ec9
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-4.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-5.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-5.png
new file mode 100644
index 00000000..dac8525d
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-5.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-6.png
new file mode 100644
index 00000000..a9b249b6
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-6.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-7.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-7.png
new file mode 100644
index 00000000..75d7898a
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-7.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-8.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-8.png
new file mode 100644
index 00000000..267278b4
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-8.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-9.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-9.png
new file mode 100644
index 00000000..0dca46e6
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-beta-9.png differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/bare-metal-manual-install.rst b/source/clear-linux/get-started/bare-metal-manual-install/bare-metal-manual-install.rst
deleted file mode 100644
index d5849e12..00000000
--- a/source/clear-linux/get-started/bare-metal-manual-install/bare-metal-manual-install.rst
+++ /dev/null
@@ -1,288 +0,0 @@
-.. _bare-metal-manual-install:
-
-Install |CL-ATTR| on bare metal (manual)
-#############################################
-
-This section contains the steps for a |CL-ATTR| manual installation. It
-picks up where the :ref:`bare-metal-install` left off.
-
-To perform additional tasks during the |CL| Installer setup, select the 
-:guilabel:`< Manual(Advanced) >` menu option (figure 1).  
-
-* :ref:`Modify the disk layout using the cgdisk utility<cgdisk-manual-install>`
-* Add additional command-line parameters to the kernel
-* Create a hostname for your system
-* Create an administrative user
-* Add additional software bundles to enhance the functionality of your
-  initial |CL| installation
-* Optionally set up a static IP address for your system
-
-Begin the manual installation process
-*************************************
-
-#. Move the cursor to the :guilabel:`< Manual(Advanced) >` menu item
-   and press the :kbd:`Enter` key.
-
-   .. figure:: figures/bare-metal-manual-install-1.png
-      :scale: 50 %
-      :alt: Choose installation Type
-
-   Figure 1: :guilabel:`Choose installation Type`
-
-#. The screen :guilabel:`Choose partitioning method` will
-   appear (figure 2).
-
-   .. figure:: figures/bare-metal-manual-install-2.png
-      :scale: 50 %
-      :alt: Choose partitioning method
-
-      Figure 2: :guilabel:`Choose partitioning method`
-
-   If your hard drive has already been partitioned for a Linux system, you 
-   can select the :guilabel:`< Use default partition and mount scheme on 
-   target device >` menu item and press :kbd:`Enter` to move to the next
-   step of the installer setup process.
-
-   .. _cgdisk-manual-setup:
-
-   Otherwise, to set up your hard drive partitions manually before moving to
-   the next step, select the :guilabel:`< Manually configure mounts and
-   partitions >` menu item and follow the instructions for :ref:`using CGDISK
-   to set up your Clear Linux hard drive<cgdisk-manual-install>`.
-
-.. _choose-target-device:
-
-Choose target device for installation
-=====================================
-
-The :guilabel:`Choose target device for installation` menu, shown in figure 
-3, displays the current device and partition information. In
-this example, ``/dev/sda`` is the only drive on the system with three
-partitions defined and assigned. The menu cursor highlights the partition
-to install |CL| onto.
-
-#. Select the :guilabel:`< Partition /dev/sda >` button and press the
-   :kbd:`Enter` key.
-
-   .. note::
-
-      To return to the previous menu, press the :kbd:`Tab` key
-      to highlight the :guilabel:`< Previous >` button and press :kbd:`Enter`
-      to return to the previous menu.
-
-   .. figure:: figures/bare-metal-manual-install-3.png
-      :scale: 50 %
-      :alt: Choose target device for installation
-
-      Figure 3: :guilabel:`Choose target device for installation`
-
-#. Next, you will be presented with a warning screen (figure 4) with
-   :guilabel:`< No >` highlighted by default. If this is the device onto
-   which you wish to install |CL|, press :kbd:`Tab` to highlight
-   the :guilabel:`< Yes >` button. 
-
-#. Press :kbd:`Enter` to proceed.
-
-   .. figure:: figures/bare-metal-manual-install-4.png
-      :scale: 50 %
-      :alt: Device installation warning
-
-      Figure 4: :guilabel:`Device installation warning`
-
-.. _incl-additional-manual-installer-settings:
-
-Additional manual installer settings
-====================================
-
-The next steps of the manual installer setup process allows you to:
-
-* Set up any additional command-line parameters to the kernel.
-* Create a hostname for your system.
-* Set up an administrative user.
-* Install additional software bundles.
-* Optionally create a static IP address for your system.
-
-#. The :guilabel:`Append to kernel cmdline` menu shown in figure 5 allows you
-   to add more options to the kernel command-line to further customize
-   your installation.  Normally this is not required; however, if there are
-   specific options that need to be set in the Linux kernel, you can enter
-   them here. For a complete list of command-line parameters for the Linux
-   kernel you can visit the official documentation of the `latest kernel's
-   command-line parameters`_.
-
-   Add any additional command-line parameters in the :guilabel:`Append to
-   cmdline:` field and then press the :kbd:`Tab` key to move to the
-   :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/bare-metal-manual-install-5.png
-      :scale: 50 %
-      :alt: Append to kernel cmdline
-
-      Figure 5: :guilabel:`Append to kernel cmdline`
-
-#. The :guilabel:`Configuring Hostname` menu shown in figure 6 suggests
-   a hostname string prefaced with "clr". You can make your hostname anything
-   meaningful and unique. Once complete, press the :kbd:`Tab` key to move to
-   the :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/bare-metal-manual-install-6.png
-      :scale: 50 %
-      :alt: Configure Hostname
-
-   Figure 6: :guilabel:`Configure Hostname`
-
-   To learn more about hostname naming conventions and restrictions, you can
-   check this `wiki page about hostnames`_.
-
-#. The :guilabel:`User configuration` menu shown in figure 7 allows you to
-   create a userid with administrative privileges. If you do not want to 
-   create a user at this time, select 
-   :guilabel:`< No user creation (login as root) >` to skip this step and
-   proceed to the :guilabel:`Bundle selector` menu.
-
-   .. figure:: figures/bare-metal-manual-install-7.png
-      :scale: 50 %
-      :alt: User configuration
-
-   Figure 7: :guilabel:`User configuration`
-
-   #. To create a userid, select the :guilabel:`< Create an administrative 
-      user >` field and press :kbd:`Enter` to go to the the next screen.
-   #. You will be presented with the second :guilabel:`User configuration` 
-      menu shown in figure 8. You are only required to fill in the
-      :guilabel:`Username`, :guilabel:`Password`, and :guilabel:`Confirm 
-      password` fields.
-   #. To give a user administrative privileges, press :kbd:`Tab` until
-      cursor appears in the field :guilabel:`Add user to the sudoers?` and
-      select. This adds the user to the ``wheel`` group and allows entry of 
-      the :command:`sudo` command.
-
-      After entering all data, press :kbd:`Tab` until :guilabel:`< Next >`
-      is highlighted. Then press :kbd:`Enter`.
-
-      .. figure:: figures/bare-metal-manual-install-8.png
-         :scale: 50 %
-         :alt: User configuration - create user
-
-      Figure 8: :guilabel:`User configuration - create user`
-
-#. In the menu :guilabel:`Bundle selector` (figure 9), you can add
-   software bundles to your initial |CL| installation. Press the :kbd:`Tab`
-   key to highlight additional bundles, and then press :kbd:`Spacebar` or 
-   :kbd:`Enter` to select each bundle. This menu will also list the
-   additional :guilabel:`--- required ---` software bundles that will be
-   installed during the |CL| installation.
-
-   .. figure:: figures/bare-metal-manual-install-9.png
-      :scale: 50 %
-      :alt: Bundle selector
-
-      Figure 9: :guilabel:`Bundle selector`
-
-For a complete description of the content of these additional bundles, go to
-the :ref:`software bundle list <bundles>` and select the name for a
-specific bundle to show the contents within the bundle.
-
-.. _incl-additional-manual-installer-settings-end:
-
-Target system network configuration
-===================================
-
-Before the actual |CL| installation begins, we must set up the
-:guilabel:`Network configuration` shown in figure 10. Select
-:guilabel:`< Use DHCP >` to have an IP address automatically assigned when
-the system boots up.
-
-.. figure:: figures/bare-metal-manual-install-10.png
-   :scale: 50 %
-   :alt: Network configuration
-
-   Figure 10: :guilabel:`Network configuration`
-
-You can optionally set up a static IP address for your system.  Select the
-:guilabel:`< Use static IP configuration >` menu item and fill in the
-required fields.
-
-Begin installation
-******************
-
-The |CL| installer is now ready to use the information you provided on the
-previous sections to begin the actual installation. Figure 11 shows the
-installer's prompt to begin the installation.
-
-.. figure:: figures/bare-metal-manual-install-11.png
-   :scale: 50 %
-   :alt: Begin installation
-
-   Figure 11: :guilabel:`Begin installation`
-
-When you are satisfied with the information entered, select the
-:guilabel:`< Yes >` button and press :kbd:`Enter` to begin installing |CL|.
-
-The |CL| Installation begins and each step shows its status as it progresses
-through the manual installation process as shown in figure 12.
-
-.. figure:: figures/bare-metal-manual-install-12.png
-   :scale: 50 %
-   :alt: Installation status
-
-   Figure 12: :guilabel:`Installation status`
-
-Once all steps have completed, you will see the ``Successful installation``
-status message and the :guilabel:`< Ok >` button is highlighted as shown in
-figure 13. Press the :kbd:`Enter` key to continue.
-
-.. figure:: figures/bare-metal-manual-install-13.png
-   :scale: 50 %
-   :alt: Installation complete
-
-   Figure 13: :guilabel:`Installation complete`
-
-Congratulations! The installation completed successfully and the system will
-reboot. Figure 14 shows the installer's final prompt. Press the :kbd:`Enter`
-key and remove the USB media while the system restarts.
-
-.. figure:: figures/bare-metal-manual-install-14.png
-   :scale: 50 %
-   :alt: Successful Installation
-
-   Figure 14: :guilabel:`Successful Installation`
-
-Once the system boots, the Gnome Desktop sign-in screen shown in figure 15
-appears:
-
-.. figure:: figures/bare-metal-manual-install-15.png
-   :scale: 50 %
-   :alt: Gnome sign-in screen
-
-   Figure 15: :guilabel:`Gnome sign-in screen`
-
-Click on the :guilabel:`username` you created, enter the password, and you
-will be logged into the system. The Gnome 3 desktop appears as shown in
-figure 16:
-
-.. figure:: figures/bare-metal-manual-install-16.png
-   :scale: 50 %
-   :alt: Gnome Desktop Manager
-
-   Figure 16: :guilabel:`Gnome Desktop Manager`
-
-**Congratulations!**
-
-You have successfully installed |CL| on a bare metal system using the
-manual installation method.
-
-Visit our :ref:`tutorials <tutorials>` section for examples on using your
-|CL| system.
-
-.. _`information about stateless`:
-   https://clearLinux.org/features/stateless
-
-.. _`wiki page about Hostnames`:
-   https://en.wikipedia.org/wiki/Hostname
-
-.. _`learn more about telemetry.`:
-   https://clearLinux.org/features/telemetry
-
-.. _`latest kernel's command-line parameters`:
-   https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-1.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-1.png
deleted file mode 100644
index cb023cf5..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-1.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-10.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-10.png
deleted file mode 100644
index d8a3f5f3..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-10.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-11.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-11.png
deleted file mode 100644
index 107febc4..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-11.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-12.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-12.png
deleted file mode 100644
index 66751565..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-12.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-13.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-13.png
deleted file mode 100644
index 9a14d9e1..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-13.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-14.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-14.png
deleted file mode 100644
index 50fdc0ed..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-14.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-15.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-15.png
deleted file mode 100644
index 7b538705..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-15.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-16.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-16.png
deleted file mode 100644
index df61163b..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-16.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-2.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-2.png
deleted file mode 100644
index b52d3f3b..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-2.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-3.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-3.png
deleted file mode 100644
index 2c5ff918..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-3.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-4.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-4.png
deleted file mode 100644
index a5897712..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-4.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-5.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-5.png
deleted file mode 100644
index 54acbe3e..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-5.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-6.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-6.png
deleted file mode 100644
index 0d2fe7f2..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-6.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-7.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-7.png
deleted file mode 100644
index a98d99b8..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-7.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-8.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-8.png
deleted file mode 100644
index 8401cf67..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-8.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-9.png b/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-9.png
deleted file mode 100644
index 4b7fa392..00000000
Binary files a/source/clear-linux/get-started/bare-metal-manual-install/figures/bare-metal-manual-install-9.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/cgdisk-manual-install.rst b/source/clear-linux/get-started/cgdisk-manual-install/cgdisk-manual-install.rst
deleted file mode 100644
index 5f00c804..00000000
--- a/source/clear-linux/get-started/cgdisk-manual-install/cgdisk-manual-install.rst
+++ /dev/null
@@ -1,313 +0,0 @@
-.. _cgdisk-manual-install:
-
-Create partitions for |CL-ATTR| using CGDISK
-############################################
-
-These instructions guide you through the initial setup of your hard drive
-partitions using the :command:`cgdisk` utility . If you do not wish to continue 
-creating your own partitions, :ref:`return to the bare metal manual installation
-<bare-metal-manual-install>`.
-
-Prerequisites
-*************
-
-This guide assumes that you have followed the :ref:`bare-metal-install`
-guide and intend to :ref:`install Clear Linux manually
-<bare-metal-manual-install>` by choosing the :guilabel:`< Manual(Advanced) >`
-menu item on the :guilabel:`Choose Installation Type` |CL| Installer setup
-menu as shown in figure 1:
-
-.. figure:: figures/cgdisk-manual-install-1.png
-   :scale: 50 %
-   :alt: Choose installation Type
-
-   Figure 1: :guilabel:`Choose installation Type`
-
-Partition using CGDISK
-**********************
-
-We use the :command:`cgdisk` application to create a
-:abbr:`GPT (GUID Partition Table)` since |CL| only supports the
-:abbr:`UEFI (Unified Extensible Firmware Interface)` specification. For a
-complete description of the :command:`cgdisk` utility and how to use it,
-visit Rod Smith's website for a `GPT fdisk tutorial`_.
-
-In this guide, we intend to use an unpartitioned hard drive for the |CL|
-installation.
-
-#. To manually partition your hard drive, select 
-   :guilabel:`< Manually configure mounts and partitions >` in the menu
-   :guilabel:`Choose partitioning method`, shown in figure 2. 
-   
-   .. figure:: figures/cgdisk-manual-install-2.png
-      :scale: 50 %
-      :alt: Choose partitioning method
-
-      Figure 2: :guilabel:`Choose partitioning method`
-
-   Next, the current device available to partition is shown. In this
-   example, shown in figure 3, :file:`/dev/sda` is available but
-   does not have any partitions defined.
-
-#. Select the :guilabel:`< Partition /dev/sda >` menu item and press
-   :kbd:`Enter` to begin the process of modifying this disk.
-
-   .. figure:: figures/cgdisk-manual-install-3.png
-      :scale: 50 %
-      :alt: Choose a drive to partition using cgdisk tool
-
-      Figure 3: :guilabel:`Choose a drive to partition using cgdisk tool`
-
-   The :command:`cgdisk` application starts and displays the settings for
-   :file:`/dev/sda` as shown in figure 4.
-
-   .. figure:: figures/cgdisk-manual-install-4.png
-      :scale: 50 %
-      :alt: cgdisk
-
-      Figure 4: :guilabel:`cgdisk`
-
-Linux partition setup
-*********************
-
-In order to properly set up the |CL| partitioning scheme, we create three
-partitions using the :command:`cgdisk` utility in the following order:
-
-#. EFI boot partition
-#. Linux swap partition
-#. Linux root partition
-
-For a complete understanding of these partitions, you can review the
-`Linux partitioning scheme`_ information.
-
-Create the EFI boot partition
-=============================
-
-#. With the free space highlighted in the :command:`cgdisk` utility,
-   you can either select the :guilabel:`[ New ]` button and press :kbd:`Enter`
-   or press the :kbd:`N` key to define a new partition.
-
-   The utility prompts you to enter the first sector. Press the :kbd:`Enter`
-   key to accept the default value shown.
-
-   .. note::
-      In this example, the first sector starts at 2048. For more information
-      about alignment using the cgdisk tool, see
-      `Rod Smith's Partitioning Advice about alignment`_.
-
-#. The program then prompts you for the size of the partition. To create a
-   512MB partition, enter 512M and press :kbd:`Enter` as shown in figure 5:
-
-   .. figure:: figures/cgdisk-manual-install-5.png
-      :scale: 50 %
-      :alt: cgdisk - New
-
-      Figure 5: :guilabel:`cgdisk - New partition`
-
-#. To define the type of partition, the :command:`cgdisk` utility has
-   pre-defined partition types. Press the :kbd:`L` key to show the hex codes
-   you can use. Use these codes to set the correct
-   :abbr:`GUID (Globally unique identifier)` for *GPT partition types* as
-   shown in figure 6:
-
-   .. figure:: figures/cgdisk-manual-install-6.png
-      :scale: 50 %
-      :alt: cgdisk - hex codes for partition types
-
-      Figure 6: :guilabel:`cgdisk - hex codes for partition types`
-
-   We need to use the following three codes for our partitions:
-
-   * ef00 - EFI System
-   * 8200 - Linux swap
-   * 8300 - Linux filesystem
-
-#. To create the EFI boot partition, enter ``ef00`` as the hexcode for this
-   partition and press :kbd:`Enter`.
-
-#. To name the partition, enter ``boot`` and press :kbd:`Enter` to finish
-   setting up the EFI boot partition. The utility shows the first partition as
-   an ``EFI System`` 512MiB partition named ``boot`` as shown in figure 7:
-
-   .. figure:: figures/cgdisk-manual-install-7.png
-      :scale: 50 %
-      :alt: cgdisk - boot partition defined
-
-      Figure 7: :guilabel:`cgdisk - boot partition defined`
-
-Create the Linux swap partition
-===============================
-
-Next, we must create the Linux swap partition. In figure 7, notice the two
-areas defined as free space. We created the first 1007.0 KiB free space area
-when we started the EFI boot partition at sector 2048. For more information
-about it, review `Rod Smith's Partitioning advice about alignment`_.
-
-#. Move your cursor to highlight the larger free space of 334.8 GiB at the
-   bottom of the partition list before you begin to create the Linux swap
-   partition as shown in figure 8:
-
-   .. figure:: figures/cgdisk-manual-install-8.png
-      :scale: 50 %
-      :alt: cgdisk - free space selection
-
-      Figure 8: :guilabel:`cgdisk - free space selection`
-
-#. To create the Linux swap partition, with the largest free space
-   highlighted, select the :guilabel:`[ New ]` button or press the :kbd:`N`
-   key and enter the following values for the Linux swap partition:
-
-   .. code-block:: console
-
-      First sector:  press :kbd:`Enter` to select the default value
-      Size in sectors:  4G
-      Hex code or GUID:  8200
-      Enter new partition name:  swap
-
-   Your :command:`cgdisk` partition list should now look like figure 9.
-
-   .. figure:: figures/cgdisk-manual-install-9.png
-      :scale: 50 %
-      :alt: cgdisk - swap partition defined
-
-      Figure 9: :guilabel:`cgdisk - swap partition defined`
-
-Create the Linux filesystem partition
-=====================================
-
-Lastly, we must create the the Linux filesystem partition to use it as the
-root mount point for you |CL| installation.
-
-#. Highlight the largest free space entry at the bottom of the list and select
-   the :guilabel:`[ New ]` button or press the :kbd:`N` key and enter the
-   following values to create the Linux filesystem partition:
-
-   .. code-block:: console
-
-      First sector:  press :kbd:`Enter` to select the default value
-      Size in sectors:  press :kbd:`Enter` to select the default value, which
-                        is the remainder of available space on the disk
-      Hex code or GUID:  8300
-      Enter new partition name:  root
-
-   With all the partitions now defined, you should see a list similar to what
-   is shown in figure 10:
-
-   .. figure:: figures/cgdisk-manual-install-10.png
-      :scale: 50 %
-      :alt: cgdisk - defined partitions
-
-      Figure 10: :guilabel:`cgdisk - defined partitions`
-
-#. If you are satisfied that the partition scheme is correct, you need to
-   write this GPT to the hard drive. Select the :guilabel:`[ Write ]` button
-   or press the :kbd:`W` key and the :command:`cgdisk` program prompts with:
-
-   .. code-block:: console
-
-      Are you sure you want to write the partition table to disk? (yes or no)
-
-#. Enter ``yes`` and press :kbd:`Enter` to write this data to the hard drive
-   and then select the :guilabel:`[ Quit ]` button or press :kbd:`Q` to exit
-   the :command:`cgdisk` utility.
-
-#. You see the partitions that were created as shown in figure 11. Move your
-   cursor to the :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/cgdisk-manual-install-11.png
-      :scale: 50 %
-      :alt: defined partitions
-
-      Figure 11: :guilabel:`defined partitions`
-
-Set the mount points
-********************
-
-The :guilabel:`Set mount points` menu sets the mount points that the |CL|
-installer uses for your |CL| installation, shown in figure 12.
-
-.. figure:: figures/cgdisk-manual-install-12.png
-   :scale: 50 %
-   :alt: Set mount points
-
-   Figure 12: :guilabel:`Set mount points`
-
-In this menu you need to set the mount points for the boot and root
-partitions and select to format them.
-
-#. Highlight the EFI System partition type menu entry and press the
-   :kbd:`Enter` key to edit this item. The :guilabel:`Set mount point of
-   sda1` menu is shown.
-
-   #. For :guilabel:`Enter mount point:` type `/boot` and press
-      :kbd:`Enter`.
-   #. Press Tab to enter the :guilabel:`[ ] Format` field. 
-   #. Press Enter/Spacebar to select :guilabel:`[ ] Format`, which allows
-      formatting of the partition. 
-      
-   Figure 13 shows the information entered.  Select :guilabel:`< Next >`
-   and press :kbd:`Enter`.
-
-   .. figure:: figures/cgdisk-manual-install-13.png
-      :scale: 50 %
-      :alt: Set mount point of sda1
-
-      Figure 13: :guilabel:`Set mount point of sda1`
-
-#. Do the same for the Linux filesystem partition by highlighting the
-   :guilabel:`Linux filesystem` menu entry and entering the information shown
-   in figure 14 to set the :guilabel:`Enter mount point:` to :file:`/` and
-   enable formatting:
-
-   .. figure:: figures/cgdisk-manual-install-14.png
-      :scale: 50 %
-      :alt: Set mount point of sda3
-
-      Figure 14: :guilabel:`Set mount point of sda3`
-
-#. Optional: Select :guilabel:`Encrypt Root Partition`, if
-   desired, as shown in figure 15. 
-
-   .. note:: 
-      `Set mount points` now show as completed. 
-   
-   .. figure:: figures/cgdisk-manual-install-15.png
-      :scale: 50 %
-      :alt: Encrypt root partition
-
-      Figure 15: :guilabel:`Encrypt root partition`
-
-#. Type a confirmation passphrase as directed.    
-
-   .. note: 
-
-      It is recommended to record the passphrase for safekeeping. 
-               
-   .. figure:: figures/cgdisk-manual-install-16.png
-      :scale: 50 %
-      :alt: Type confirmation passphrase
-
-      Figure 16: :guilabel: `Type confirmation passphrase`
-
-#. Select the :guilabel:`< Next >` button and press :kbd:`Enter`. 
-   
-   You have completed the process of manually partitioning your target
-   system. 
-
-#. Now, :ref:`return to the bare metal manual installation 
-   <bare-metal-manual-install>` to complete installation of |CL|.
-   
-   Continue at the section :ref:`Additional manual installer settings
-   <incl-additional-manual-installer-settings>`.
-
-.. _`GPT fdisk tutorial`:
-   http://www.rodsbooks.com/gdisk/
-
-.. _`Rod Smith's Partitioning Advice about alignment`:
-   http://www.rodsbooks.com/gdisk/advice.html#alignment
-
-.. _`information about swupd`:
-   https://clearlinux.org/features/software-update
-
-.. _`Linux partitioning scheme`:
-   https://wiki.archlinux.org/index.php/partitioning#Partition_scheme
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-1.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-1.png
deleted file mode 100644
index cb023cf5..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-1.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-10.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-10.png
deleted file mode 100644
index 8d977f83..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-10.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-11.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-11.png
deleted file mode 100644
index 3e73dc50..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-11.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-12.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-12.png
deleted file mode 100644
index 542c3101..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-12.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-13.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-13.png
deleted file mode 100644
index 7393ad38..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-13.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-14.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-14.png
deleted file mode 100644
index a558b8ec..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-14.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-15.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-15.png
deleted file mode 100644
index 6b824a1f..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-15.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-16.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-16.png
deleted file mode 100644
index 77ff7d05..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-16.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-2.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-2.png
deleted file mode 100644
index 4120d770..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-2.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-3.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-3.png
deleted file mode 100644
index 97303025..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-3.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-4.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-4.png
deleted file mode 100644
index d81b6d95..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-4.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-5.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-5.png
deleted file mode 100644
index 75163ffa..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-5.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-6.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-6.png
deleted file mode 100644
index 1528b667..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-6.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-7.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-7.png
deleted file mode 100644
index f9b007fc..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-7.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-8.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-8.png
deleted file mode 100644
index 7c41a266..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-8.png and /dev/null differ
diff --git a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-9.png b/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-9.png
deleted file mode 100644
index b5b351c3..00000000
Binary files a/source/clear-linux/get-started/cgdisk-manual-install/figures/cgdisk-manual-install-9.png and /dev/null differ
diff --git a/source/clear-linux/get-started/get-started.rst b/source/clear-linux/get-started/get-started.rst
index 89248397..15ebfb9b 100644
--- a/source/clear-linux/get-started/get-started.rst
+++ b/source/clear-linux/get-started/get-started.rst
@@ -3,31 +3,29 @@
 Get started
 ###########
 
-The Get Started section will get you up and running fast with |CL-ATTR|. Use 
-these step-by-step instructions to guide you through the installation of |CL| 
+The Get Started section will get you up and running fast with |CL-ATTR|. Use
+these step-by-step instructions to guide you through the installation of |CL|
 from bare metal to a live image.
- 
+
 Pre-install
 ***********
 
-* :ref:`system-requirements` 
+* :ref:`system-requirements`
 
 .. toctree::
    :maxdepth: 1
 
    compatibility-check
-   bootable-usb/bootable-usb   
+   bootable-usb/bootable-usb
    bootable-usb/bootable-usb-beta-all
 
-Install |CL| 
+Install |CL|
 ************
 
 .. toctree::
    :maxdepth: 1
 
    bare-metal-install/bare-metal-install
-   bare-metal-manual-install/bare-metal-manual-install
-   cgdisk-manual-install/cgdisk-manual-install
    virtual-machine-install/virtual-machine-install
    live-image
    bare-metal-install-beta/bare-metal-install-beta
\ No newline at end of file