diff --git a/doc/contributions.txt b/doc/contributions.txt
index d860ac0427..1bc26efb34 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -196,6 +196,7 @@ Ansariel Hiller
 	MAINT-6397
 	MAINT-6432	
 	STORM-2133
+	MAINT-6511
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 621b5b3085..beb0256080 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2422,10 +2422,7 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
 	{
 		LLView* viewp = *child_it;
-		// <FS:Ansariel> Prefer dynamic_cast over c-style cast
-		//LLFloater* floaterp = (LLFloater*)viewp;
 		LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
-		// </FS:Ansariel>
 		if (floaterp->isDependent())
 		{
 			// dependents are moved with their "dependee"
@@ -2482,10 +2479,7 @@ void LLFloaterView::restoreAll()
 	// make sure all subwindows aren't minimized
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
 	{
-		// <FS:Ansariel> Possible fix for crash on disconnect
-		//LLFloater* floaterp = (LLFloater*)*child_it;
 		LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
-		// </FS:Ansariel>
 		if (floaterp)
 		{
 			floaterp->setMinimized(FALSE);
@@ -2830,10 +2824,7 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
 				++child_it) //loop floaters
 			{
 				// Examine minimized children.
-				// <FS:Ansariel> Prefer dynamic_cast over c-style cast
-				//LLFloater* floater = (LLFloater*)((LLView*)*child_it);
 				LLFloater* floater = dynamic_cast<LLFloater*>(*child_it);
-				// </FS:Ansariel>
 				if(floater->isMinimized()) 
 				{
 					LLRect r = floater->getRect();
@@ -2888,10 +2879,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
 			continue;
 		}
 
-		// <FS:Ansariel> FIRE-14349: Crash in LLPanelEditWearable::isDirty() due to memory corruption?
-		//LLFloater* floaterp = (LLFloater*)viewp;
 		LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
-		// </FS:Ansariel>
 
 		// Attempt to close floater.  This will cause the "do you want to save"
 		// dialogs to appear.
@@ -2957,11 +2945,7 @@ BOOL LLFloaterView::allChildrenClosed()
 	// by setting themselves invisible)
 	for (child_list_const_iter_t it = getChildList()->begin(); it != getChildList()->end(); ++it)
 	{
-		// <FS:Ansariel> Prefer dynamic_cast over c-style cast
-		//LLView* viewp = *it;
-		//LLFloater* floaterp = (LLFloater*)viewp;
 		LLFloater* floaterp = dynamic_cast<LLFloater*>(*it);
-		// </FS:Ansariel>
 
 		if (floaterp->getVisible() && !floaterp->isDead() && floaterp->isCloseable())
 		{
@@ -3245,10 +3229,7 @@ void LLFloaterView::syncFloaterTabOrder()
 		// otherwise, make sure the focused floater is in the front of the child list
 		for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(); child_it != getChildList()->rend(); ++child_it)
 		{
-			// <FS:Ansariel> Prefer dynamic_cast over c-style cast
-			//LLFloater* floaterp = (LLFloater*)*child_it;
 			LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
-			// </FS:Ansariel>
 			if (gFocusMgr.childHasKeyboardFocus(floaterp))
 			{
 				bringToFront(floaterp, FALSE);
@@ -3270,10 +3251,7 @@ LLFloater*	LLFloaterView::getParentFloater(LLView* viewp) const
 
 	if (parentp == this)
 	{
-		// <FS:Ansariel> FIRE-14349: Crash in LLPanelEditWearable::isDirty() due to memory corruption?
-		//return (LLFloater*)viewp;
 		return dynamic_cast<LLFloater*>(viewp);
-		// </FS:Ansariel>
 	}
 
 	return NULL;