Currently, the pid file is simply cleared out (but not removed). It should be removed altogether.

To avoid any potential misunderstanding: note that the lock file should continue to use the clear-not-remove logic to avoid a fs race condition. This ticket only concerns the pid file.