Remove TODOs fixed by using "lsof +D"