Remove TODOs which were done in last commit