Removing TODO lines

[skip ci]