diff --git a/agent/agent.go b/agent/agent.go
index e7ae4a9..84f1889 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -444,6 +444,7 @@ func (a *Agent) RunPythonCode(code string, timeout int, args []string) (string,
 		a.Logger.Debugln(err)
 		return "", err
 	}
+	defer os.Remove(tmpfn.Name())
 	if err := tmpfn.Close(); err != nil {
 		a.Logger.Debugln(err)
 		return "", err
diff --git a/agent/agent_windows.go b/agent/agent_windows.go
index 6b3ab87..e99af6b 100644
--- a/agent/agent_windows.go
+++ b/agent/agent_windows.go
@@ -577,6 +577,7 @@ func (a *Agent) UninstallCleanup() {
 	a.PatchMgmnt(false)
 	a.CleanupAgentUpdates()
 	CleanupSchedTasks()
+	os.RemoveAll(winTempDir)
 }
 
 func (a *Agent) AgentUpdate(url, inno, version string) {