diff --git a/.gitignore b/.gitignore
index 850758cf1e..75da3674af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,6 @@ debug.log
 
 # Ignore OS X Desktop Services Store files
 .DS_Store
+
+# Orig diff files
+*.orig
diff --git a/workspace_tools/export/gccarm.py.orig b/workspace_tools/export/gccarm.py.orig
deleted file mode 100644
index f00028fc72..0000000000
--- a/workspace_tools/export/gccarm.py.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-mbed SDK
-Copyright (c) 2011-2013 ARM Limited
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-from exporters import Exporter
-from os.path import splitext, basename
-
-
-class GccArm(Exporter):
-    NAME = 'GccArm'
-    TOOLCHAIN = 'GCC_ARM'
-<<<<<<< HEAD
-    TARGETS = ['LPC1768','KL25Z','KL46Z','LPC4088']
-=======
-    TARGETS = ['LPC1768','KL05Z','KL25Z','LPC4088']
->>>>>>> KL05Z GCC support, exporters for arm_gcc, uvision
-    DOT_IN_RELATIVE_PATH = True
-    
-    def generate(self):
-        # "make" wants Unix paths
-        self.resources.win_to_unix()
-        
-        to_be_compiled = []
-        for r_type in ['s_sources', 'c_sources', 'cpp_sources']:
-            r = getattr(self.resources, r_type)
-            if r:
-                for source in r:
-                    base, ext = splitext(source)
-                    to_be_compiled.append(base + '.o')
-        
-        libraries = []
-        for lib in self.resources.libraries:
-            l, _ = splitext(basename(lib))
-            libraries.append(l[3:])
-        
-        ctx = {
-            'name': self.program_name,
-            'to_be_compiled': to_be_compiled,
-            'object_files': self.resources.objects,
-            'include_paths': self.resources.inc_dirs,
-            'library_paths': self.resources.lib_dirs,
-            'linker_script': self.resources.linker_script,
-            'libraries': libraries,
-            'symbols': self.toolchain.get_symbols()
-        }
-        self.gen_file('gcc_arm_%s.tmpl' % self.target.lower(), ctx, 'Makefile')
diff --git a/workspace_tools/export/uvision4.py.orig b/workspace_tools/export/uvision4.py.orig
deleted file mode 100644
index 1c92de513a..0000000000
--- a/workspace_tools/export/uvision4.py.orig
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-mbed SDK
-Copyright (c) 2011-2013 ARM Limited
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-from exporters import Exporter
-from os.path import basename
-
-
-class Uvision4(Exporter):
-    NAME = 'uVision4'
-    
-<<<<<<< HEAD
-    TARGETS = ['LPC1768', 'LPC11U24', 'KL25Z', 'KL46Z', 'LPC1347', 'LPC1114', 'LPC11C24', 'LPC4088', 'LPC812', 'NUCLEO_F103RB']
-=======
-    TARGETS = ['LPC1768', 'LPC11U24', 'KL05Z', 'KL25Z', 'LPC1347', 'LPC1114', 'LPC11C24', 'LPC4088', 'LPC812', 'NUCLEO_F103RB']
->>>>>>> KL05Z GCC support, exporters for arm_gcc, uvision
-    
-    USING_MICROLIB = ['LPC11U24', 'LPC1114', 'LPC11C24', 'LPC812', 'NUCLEO_F103RB']
-    
-    FILE_TYPES = {
-        'c_sources':'1',
-        'cpp_sources':'8',
-        's_sources':'2'
-    }
-    # By convention uVision projects do not show header files in the editor:
-    # 'headers':'5',
-    
-    def get_toolchain(self):
-        return 'uARM' if (self.target in self.USING_MICROLIB) else 'ARM'
-    
-    def generate(self):
-        source_files = {
-            'mbed': [],
-            'hal': [],
-            'src': []
-        }
-        for r_type, n in Uvision4.FILE_TYPES.iteritems():
-            for file in getattr(self.resources, r_type):
-                f = {'name': basename(file), 'type': n, 'path': file}
-                if file.startswith("mbed\\common"):
-                    source_files['mbed'].append(f)
-                elif file.startswith("mbed\\targets"):
-                    source_files['hal'].append(f)
-                else:
-                    source_files['src'].append(f)
-        source_files = dict( [(k,v) for k,v in source_files.items() if len(v)>0])
-        ctx = {
-            'name': self.program_name,
-            'include_paths': self.resources.inc_dirs,
-            'scatter_file': self.resources.linker_script,
-            'object_files': self.resources.objects + self.resources.libraries,
-            'source_files': source_files.items(),
-            'symbols': self.toolchain.get_symbols()
-        }
-        target = self.target.lower()
-        
-        # Project file
-        self.gen_file('uvision4_%s.uvproj.tmpl' % target, ctx, '%s.uvproj' % self.program_name)
-        self.gen_file('uvision4_%s.uvopt.tmpl' % target, ctx, '%s.uvopt' % self.program_name)