From 17478af32d24466d4adb66c970edc844817ef3e9 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.com>
Date: Tue, 8 Oct 2019 17:31:35 -0400
Subject: [PATCH] Remove debug code

---
 .../resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml   | 3 ---
 .../qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml         | 4 ----
 .../simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml    | 2 --
 3 files changed, 9 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
index ed1888412c..ae786bfc47 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
@@ -83,9 +83,6 @@ Rectangle {
                 emptyInventoryContainer.visible = true;
             }
 
-            // ZRF REMOVE ME
-            emptyInventoryContainer.visible = true;
-
             avatarAppInventoryModel.handlePage(result.status !== "success" && result.message, result);
             root.updatePreviewUrl();
         }
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index 9fa1a97114..7082fc3e5f 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -128,10 +128,6 @@ Rectangle {
                 // If we have never auto-selected and the user is still using a default avatar or if the current avatar is not valid (fst), or if 
                 // the current avatar is the old default (Woody), use top avatar from inventory or one of the new defaults.
 
-                // ZRF REMOVE ME!   
-                currentAvatarURLContainsDefaultAvatar = true;
-                userHasValidAvatarInInventory = false;
-
                 // If the current avatar URL is invalid, OR the user is using the "default avatar" (Woody)...
                 if (!currentAvatarURLContainsFST || currentAvatarURLContainsDefaultAvatar) {
                     // If the user has a valid avatar in their inventory...
diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
index 21fb3ab809..f7b6d95e03 100644
--- a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
+++ b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
@@ -27,8 +27,6 @@ Rectangle {
     }
 
     Component.onCompleted: {
-        // ZRF REMOVE ME
-        return;
         if (Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", false) || 
             Settings.getValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", false)) {
             tempAvatarPageContainer.visible = false;