Remove those pesky TODOs

They're TODONEs