cleaned up TODOs list