diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 2d3823a6e25b7300810cbc94598dd52d1df41ea4..e8d5f9bee587feea47b5beabec06aebc6a406dac 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -194,11 +194,6 @@ LLAgentWearables::createStandardWearablesAllDoneCallback::~createStandardWearabl
 	gAgentWearables.createStandardWearablesAllDone();
 }
 
-LLAgentWearables::sendAgentWearablesUpdateCallback::~sendAgentWearablesUpdateCallback()
-{
-	gAgentWearables.sendAgentWearablesUpdate();
-}
-
 /**
  * @brief Construct a callback for dealing with the wearables.
  *
@@ -776,6 +771,8 @@ BOOL LLAgentWearables::isWearingItem(const LLUUID& item_id) const
 	return getWearableFromItemID(item_id) != NULL;
 }
 
+// SUNSHINE CLEANUP ?
+
 // MULTI-WEARABLE: DEPRECATED (see backwards compatibility)
 // static
 // ! BACKWARDS COMPATIBILITY ! When we stop supporting viewer1.23, we can assume
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index 0583c76dc43a80d6751a212957e778396009b47f..81bfef0f8e59cb9734d8f6d8e7cc855ed3478bda 100755
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -165,7 +165,9 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>, public LLWearable
 	/*virtual*/ void	invalidateBakedTextureHash(LLMD5& hash) const;
 	// SUNSHINE CLEANUP dead
 	void			sendAgentWearablesUpdate();
+	// SUNSHINE CLEANUP remove?
 	void			sendAgentWearablesRequest();
+	// SUNSHINE CLEANUP dead
 	void 			updateServer();
 	static void		onInitialWearableAssetArrived(LLViewerWearable* wearable, void* userdata);
 
@@ -244,12 +246,6 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>, public LLWearable
 	protected:
 		~createStandardWearablesAllDoneCallback();
 	};
-	// SUNSHINE CLEANUP - should be dead if sendAgentWearablesUpdate is no longer needed.
-	class sendAgentWearablesUpdateCallback : public LLRefCount
-	{
-	protected:
-		~sendAgentWearablesUpdateCallback();
-	};
 
 	class AddWearableToAgentInventoryCallback : public LLInventoryCallback
 	{
diff --git a/indra/newview/llagentwearablesfetch.cpp b/indra/newview/llagentwearablesfetch.cpp
index a2a667e66056807cfa9803f5bf369838675ce0ab..a10382b83027435afc1ec76132616aa2f82c45ef 100755
--- a/indra/newview/llagentwearablesfetch.cpp
+++ b/indra/newview/llagentwearablesfetch.cpp
@@ -70,6 +70,7 @@ void LLInitialWearablesFetch::add(InitialWearableData &data)
 	mAgentInitialWearables.push_back(data);
 }
 
+// SUNSHINE CLEANUP - should not have to wait for this message to start resolving appearance. Where to hook in instead?
 void LLInitialWearablesFetch::processContents()
 {
 	if(!gAgentAvatarp) //no need to process wearables if the agent avatar is deleted.
@@ -94,6 +95,7 @@ void LLInitialWearablesFetch::processContents()
 	}
 	else
 	{
+		// SUNSHINE CLEANUP - remove?
 		// if we're constructing the COF from the wearables message, we don't have a proper outfit link
 		LLAppearanceMgr::instance().setOutfitDirty(true);
 		processWearablesMessage();
@@ -135,6 +137,7 @@ class LLFetchAndLinkObserver: public LLInventoryFetchItemsObserver
 	}
 };
 
+// SUNSHINE CLEANUP - remove dependency on this?
 void LLInitialWearablesFetch::processWearablesMessage()
 {
 	if (!mAgentInitialWearables.empty()) // We have an empty current outfit folder, use the message data instead.
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 17e6f4e53ee376909fb2cb1365ab920e4168562f..569a2a04cc9eaec515b92e10519cec08723c6791 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2178,25 +2178,6 @@ const std::string LLVOAvatarSelf::debugDumpAllLocalTextureDataInfo() const
 	return text;
 }
 
-
-#if 0
-// Dump avatar metrics data.
-LLSD LLVOAvatarSelf::metricsData()
-{
-	// runway - add region info
-	LLSD result;
-	result["rez_status"] = LLVOAvatar::rezStatusToString(getRezzedStatus());
-	result["timers"]["debug_existence"] = mDebugExistenceTimer.getElapsedTimeF32();
-	result["timers"]["ruth_debug"] = mRuthDebugTimer.getElapsedTimeF32();
-	result["timers"]["ruth"] = mRuthTimer.getElapsedTimeF32();
-	result["timers"]["invisible"] = mInvisibleTimer.getElapsedTimeF32();
-	result["timers"]["fully_loaded"] = mFullyLoadedTimer.getElapsedTimeF32();
-	result["startup"] = LLStartUp::getPhases().dumpPhases();
-	
-	return result;
-}
-#endif
-
 class ViewerAppearanceChangeMetricsResponder: public LLCurl::Responder
 {
 	LOG_CLASS(ViewerAppearanceChangeMetricsResponder);
@@ -2332,7 +2313,7 @@ void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics()
 	std::string viewer_version_short = LLVersionInfo::getShortVersion();
 	std::string viewer_version_build = llformat("%d", LLVersionInfo::getBuild());
 
-	LLSD msg; // = metricsData();
+	LLSD msg;
 	msg["message"] = "ViewerAppearanceChangeMetrics";
 	msg["session_id"] = gAgentSessionID;
 	msg["agent_id"] = gAgentID;