diff --git a/src/HOHQMesh.jl b/src/HOHQMesh.jl
index 7003804e..5c2473ec 100644
--- a/src/HOHQMesh.jl
+++ b/src/HOHQMesh.jl
@@ -236,6 +236,8 @@ function generate_mesh(control_file;
       readchomp(`$(HOHQMesh_jll.HOHQMesh()) -sLimit $subdivision_maximum -f $tmppath`)
     end
   end
+  # For safety, ensure that the filestream to the `control_file` is closed.
+  close(control_file)
 
   String(output)
 end
diff --git a/src/Mesh/Meshing.jl b/src/Mesh/Meshing.jl
index 6d5074e2..fa101405 100644
--- a/src/Mesh/Meshing.jl
+++ b/src/Mesh/Meshing.jl
@@ -58,10 +58,9 @@ function remove_mesh!(proj::Project)
     # Remove all the output files associated with the current `proj`
     fileName = getMeshFileName(proj)
     rm(fileName)
-    # TODO: See if it is only the control file that causes issues on Windows
-    # # Get the control file name of the current project
-    # fileName = joinpath(proj.projectDirectory,proj.name) * ".control"
-    # rm(fileName)
+    # Get the control file name of the current project
+    fileName = joinpath(proj.projectDirectory,proj.name) * ".control"
+    rm(fileName)
     fileName = getPlotFileName(proj)
     rm(fileName)
     fileName = getStatsFileName(proj)