diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index d549fb4d8855569eb9dca249dc54bb11f2256adf..07b735a1bb0cfb619950d6c0c071bba5195daab7 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -2650,7 +2650,7 @@ void LLLineEditor::showContextMenu(S32 x, S32 y)
 	if (!menu)
 	{
 		llassert(LLMenuGL::sMenuContainer != NULL);
-		menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>
+		menu = LLUICtrlFactory::createFromFile<LLContextMenu>
 			("menu_text_editor.xml",
 				LLMenuGL::sMenuContainer,
 				LLMenuHolderGL::child_registry_t::instance());
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 47ac28baba231ef64a89ba97a5e3ffb6c50dd122..c03a646b223dc86d2d13efc59de4a40e8680a10f 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2169,7 +2169,7 @@ void LLTextEditor::showContextMenu(S32 x, S32 y)
 	if (!menu)
 	{
 		llassert(LLMenuGL::sMenuContainer != NULL);
-		menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>("menu_text_editor.xml", 
+		menu = LLUICtrlFactory::createFromFile<LLContextMenu>("menu_text_editor.xml", 
 																				LLMenuGL::sMenuContainer, 
 																				LLMenuHolderGL::child_registry_t::instance());
         if(!menu)
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 4772079acab14353422a8057fb61f3ca7ae5ab5c..d8af0a628740514b95d669639cb9354b5c8cec58 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -176,7 +176,7 @@ void LLToolBar::createContextMenu()
 		
 		// Create the context menu
 		llassert(LLMenuGL::sMenuContainer != NULL);
-		LLContextMenu* menu = LLUICtrlFactory::instanceFast().createFromFile<LLContextMenu>("menu_toolbars.xml", LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instanceFast());
+		LLContextMenu* menu = LLUICtrlFactory::createFromFile<LLContextMenu>("menu_toolbars.xml", LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instanceFast());
 
 		if (menu)
 		{
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 12e64809de14ea5bf183ca2ffb65070edc690381..73a379cca04b3c53986fbd29c637d1e2c9526d1e 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -487,7 +487,7 @@ void LLToolTipMgr::show(const LLToolTip::Params& params)
 
 	// fill in default tooltip params from tool_tip.xml
 	LLToolTip::Params params_with_defaults(params);
-	params_with_defaults.fillFrom(LLUICtrlFactory::instanceFast().getDefaultParams<LLToolTip>());
+	params_with_defaults.fillFrom(LLUICtrlFactory::getDefaultParams<LLToolTip>());
 	if (!params_with_defaults.validateBlock()) 
 	{
 		LL_WARNS() << "Could not display tooltip!" << LL_ENDL;
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 39a9080a64a4c99742014bc0eb6530edc910bd42..29e04e5d8c8664e8adb958d0790928b9bad8f355 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -544,7 +544,7 @@ bool	create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base)
 		icon_params.group_id = match_id;
 		icon_params.rect = LLRect(0, 16, 16, 0);
 		icon_params.visible = true;
-		icon = LLUICtrlFactory::instance().create<LLGroupIconCtrl>(icon_params);
+		icon = LLUICtrlFactory::create<LLGroupIconCtrl>(icon_params);
 	}
 	else
 	{
@@ -552,7 +552,7 @@ bool	create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base)
 		icon_params.avatar_id = match_id;
 		icon_params.rect = LLRect(0, 16, 16, 0);
 		icon_params.visible = true;
-		icon = LLUICtrlFactory::instance().create<LLAvatarIconCtrl>(icon_params);
+		icon = LLUICtrlFactory::create<LLAvatarIconCtrl>(icon_params);
 	}
 
 	LLInlineViewSegment::Params params;
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 597f8ba9f505c3f1d81fb5143697fac9abcf8b8c..18cd4f6770d71f80210eb2e310152b506ca99b16 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -322,7 +322,7 @@ void LLFloaterIMContainer::addFloater(LLFloater* floaterp,
 	{
 		LLGroupIconCtrl::Params icon_params;
 		icon_params.group_id = session_id;
-		icon = LLUICtrlFactory::instance().create<LLGroupIconCtrl>(icon_params);
+		icon = LLUICtrlFactory::create<LLGroupIconCtrl>(icon_params);
 		icon_id = session_id;
 
 		mSessions[session_id] = floaterp;
@@ -334,7 +334,7 @@ void LLFloaterIMContainer::addFloater(LLFloater* floaterp,
 
 		LLAvatarIconCtrl::Params icon_params;
 		icon_params.avatar_id = avatar_id;
-		icon = LLUICtrlFactory::instance().create<LLAvatarIconCtrl>(icon_params);
+		icon = LLUICtrlFactory::create<LLAvatarIconCtrl>(icon_params);
 		icon_id = avatar_id;
 
 		mSessions[session_id] = floaterp;