Various minor cleanup (removing completed/invalid TODOs)