Removed last TODOs