diff --git a/lldb/tools/lldb-mi/MIUtilSetID.cpp b/lldb/tools/lldb-mi/MIUtilSetID.cpp
deleted file mode 100644
index 5c2eaf0271a0..000000000000
--- a/lldb/tools/lldb-mi/MIUtilSetID.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//===-- MIUtilSetID.cpp -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-//++
-// File:		MIUtilSetID.cpp
-//
-// Overview:	CMIUtilSetID interface.
-//
-// Environment:	Compilers:	Visual C++ 12.
-//							gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
-//				Libraries:	See MIReadmetxt. 
-//
-// Copyright:	None.
-//--
-
-// In-house headers:
-#include "MIUtilSetID.h"
-
-//++ ------------------------------------------------------------------------------------
-// Details:	CMIUtilSetID constructor.
-// Type:	Method.
-// Args:	None.
-// Return:	None.
-// Throws:	None.
-//--
-CMIUtilSetID::CMIUtilSetID( void )
-{
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details:	CMIUtilSetID destructor.
-// Type:	Method.
-// Args:	None.
-// Return:	None.
-// Throws:	None.
-//--
-CMIUtilSetID::~CMIUtilSetID( void )
-{
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details:	Register an ID.
-// Type:	Method.
-// Args:	vId	- (R) Unique ID i.e. GUID.
-// Return:	MIstatus::success - Functional succeeded.
-//			MIstatus::failure - Functional failed.
-// Throws:	None.
-//--
-bool CMIUtilSetID::Register( const CMIUtilString & vId )
-{
-	if( !IsValid( vId ) )
-	{
-		SetErrorDescription( CMIUtilString::Format( "ID '%s' invalid", vId.c_str() ) );
-		return MIstatus::failure;
-	}
-
-	if( HaveAlready( vId ) )
-		return MIstatus::success;
-
-	insert( vId );
-
-	return MIstatus::success;
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details:	Unregister an ID.
-// Type:	Method.
-// Args:	vId	- (R) Unique ID i.e. GUID.
-// Return:	MIstatus::success - Functional succeeded.
-//			MIstatus::failure - Functional failed.
-// Throws:	None.
-//--
-bool CMIUtilSetID::Unregister( const CMIUtilString & vId )
-{
-	if( !IsValid( vId ) )
-	{
-		SetErrorDescription( CMIUtilString::Format( "ID '%s' invalid", vId.c_str() ) );
-		return MIstatus::failure;
-	}
-
-	erase( vId );
-
-	return MIstatus::success;
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details:	Check an ID is already registered.
-// Type:	Method.
-// Args:	vId	- (R) Unique ID i.e. GUID.
-// Return:	True - registered.
-//			False - not found.
-// Throws:	None.
-//--
-bool CMIUtilSetID::HaveAlready( const CMIUtilString & vId ) const
-{
-	const_iterator it = find( vId );
-	if( it != end() )
-		return true;
-	
-	return false;
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details:	Check the ID is valid to be registered.
-// Type:	Method.
-// Args:	vId	- (R) Unique ID i.e. GUID.
-// Return:	True - valid.
-//			False - not valid.
-// Throws:	None.
-//--
-bool CMIUtilSetID::IsValid( const CMIUtilString & vId ) const
-{
-	bool bValid = true;
-
-	if( vId.empty() )
-		bValid = false;
-	
-	return bValid;
-}
-
diff --git a/lldb/tools/lldb-mi/MIUtilSetID.h b/lldb/tools/lldb-mi/MIUtilSetID.h
deleted file mode 100644
index 9c4e8d3e4d55..000000000000
--- a/lldb/tools/lldb-mi/MIUtilSetID.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//===-- MIUtilSetID.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-//++
-// File:		MIUtilSetID.h
-//
-// Overview:	CMIUtilSetID interface.
-//
-// Environment:	Compilers:	Visual C++ 12.
-//							gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
-//				Libraries:	See MIReadmetxt. 
-//
-// Copyright:	None.
-//--
-
-#pragma once
-
-// Third party headers:
-#include <set>
-
-// In-house headers:
-#include "MIUtilString.h"  
-#include "MICmnBase.h"
-
-//++ ============================================================================
-// Details:	MI common code utility class. Set type container used to handle 
-//			unique ID registration.
-// Gotchas:	None.
-// Authors:	Illya Rudkin 17/02/2014.
-// Changes:	None.
-//--
-class CMIUtilSetID 
-:	public std::set< CMIUtilString >
-,	public CMICmnBase
-{
-// Methods:
-public:
-	/* ctor */	CMIUtilSetID( void );
-	
-	bool	Register( const CMIUtilString & vId );
-	bool	Unregister( const CMIUtilString & vId );
-	bool	HaveAlready( const CMIUtilString & vId ) const;
-	bool	IsValid( const CMIUtilString & vId ) const;
-
-// Overrideable:
-public:
-	// From CMICmnBase
-	/* dtor */ virtual ~CMIUtilSetID( void );
-};