diff --git a/lib/daemon.py b/lib/daemon.py
index 15b89bf358b83daf161b574626cd66b596edce4d..c26a17625d55b8e9f4da2496f9a403b9fb2bc533 100644
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -682,4 +682,4 @@ def GenericMain(daemon_name, optionparser,
 
     exec_fn(options, args, prep_results)
   finally:
-    utils.RemovePidFile(utils.DaemonPidFileName(daemon_name))
+    utils.RemoveFile(utils.DaemonPidFileName(daemon_name))
diff --git a/lib/utils/io.py b/lib/utils/io.py
index e6f98735e2a8bc2b63845b2b01bf80cc02aa242d..bdf677e44e8c63aee4c8e7996434906edc3bf45d 100644
--- a/lib/utils/io.py
+++ b/lib/utils/io.py
@@ -707,22 +707,6 @@ def WritePidFile(pidfile):
   return fd_pidfile
 
 
-def RemovePidFile(pidfile):
-  """Remove the current process pidfile.
-
-  Any errors are ignored.
-
-  @type pidfile: string
-  @param pidfile: Path to the file to be removed
-
-  """
-  # TODO: we could check here that the file contains our pid
-  try:
-    RemoveFile(pidfile)
-  except Exception: # pylint: disable-msg=W0703
-    pass
-
-
 def ReadWatcherPauseFile(filename, now=None, remove_after=3600):
   """Reads the watcher pause file.
 
diff --git a/test/ganeti.utils.io_unittest.py b/test/ganeti.utils.io_unittest.py
index 43b4634b4dee3a67ef05047069b42fc26d525f69..b445abe05c5c8d990ec4e60d482cd990400a1392 100755
--- a/test/ganeti.utils.io_unittest.py
+++ b/test/ganeti.utils.io_unittest.py
@@ -568,7 +568,7 @@ class TestTailFile(testutils.GanetiTestCase):
 
 
 class TestPidFileFunctions(unittest.TestCase):
-  """Tests for WritePidFile, RemovePidFile and ReadPidFile"""
+  """Tests for WritePidFile and ReadPidFile"""
 
   def setUp(self):
     self.dir = tempfile.mkdtemp()
@@ -585,7 +585,7 @@ class TestPidFileFunctions(unittest.TestCase):
     self.failUnlessRaises(errors.LockError, utils.WritePidFile,
                           self.f_dpn('test'))
     os.close(fd)
-    utils.RemovePidFile(self.f_dpn("test"))
+    utils.RemoveFile(self.f_dpn("test"))
     self.failIf(os.path.exists(pid_file),
                 "PID file should not exist anymore")
     self.failUnlessEqual(utils.ReadPidFile(pid_file), 0,
@@ -598,7 +598,7 @@ class TestPidFileFunctions(unittest.TestCase):
     # but now, even with the file existing, we should be able to lock it
     fd = utils.WritePidFile(self.f_dpn('test'))
     os.close(fd)
-    utils.RemovePidFile(self.f_dpn("test"))
+    utils.RemoveFile(self.f_dpn("test"))
     self.failIf(os.path.exists(pid_file),
                 "PID file should not exist anymore")
 
@@ -620,7 +620,7 @@ class TestPidFileFunctions(unittest.TestCase):
     self.failUnless(utils.IsProcessAlive(new_pid))
     utils.KillProcess(new_pid, waitpid=True)
     self.failIf(utils.IsProcessAlive(new_pid))
-    utils.RemovePidFile(self.f_dpn('child'))
+    utils.RemoveFile(self.f_dpn('child'))
     self.failUnlessRaises(errors.ProgrammerError, utils.KillProcess, 0)
 
   def tearDown(self):