diff --git a/common/foundry_install.py b/common/foundry_install.py
index 267342b..6e337f5 100755
--- a/common/foundry_install.py
+++ b/common/foundry_install.py
@@ -872,6 +872,11 @@
 
                     create_verilog_library(destlibdir, compname, do_compile_only, do_stub, excludelist)
 
+                    if do_compile_only == True:
+                        if newname:
+                            if os.path.isfile(newname):
+                                os.remove(newname)
+
                 elif option[0] == 'gds' and have_mag_8_2:
                     # If there is not a single file with all GDS cells in it,
                     # then compile one.
@@ -882,6 +887,11 @@
                         startup_script = targetdir + mag_current + pdkname + '.magicrc'
                     create_gds_library(destlibdir, compname, startup_script, do_compile_only, excludelist)
 
+                    if do_compile_only == True:
+                        if newname:
+                            if os.path.isfile(newname):
+                                os.remove(newname)
+
                 elif option[0] == 'liberty' or option[0] == 'lib':
                     # If there is not a single file with all liberty cells in it,
                     # then compile one, because one does not want to have to have
@@ -889,6 +899,11 @@
 
                     create_lib_library(destlibdir, compname, do_compile_only, excludelist)
 
+                    if do_compile_only == True:
+                        if newname:
+                            if os.path.isfile(newname):
+                                os.remove(newname)
+
                 elif option[0] == 'spice' or option[0] == 'spi':
                     # If there is not a single file with all SPICE subcircuits in it,
                     # then compile one, because one does not want to have to have
@@ -919,6 +934,11 @@
 
                     create_lef_library(destlibdir, compname, do_compile_only, excludelist)
 
+                    if do_compile_only == True:
+                        if newname:
+                            if os.path.isfile(newname):
+                                os.remove(newname)
+
         # Find any libraries/options marked as "privileged" (or "private") and
         # move the files from libs.tech or libs.ref to libs.priv, leaving a
         # symbolic link in the original location.  Do this during the initial
