Remove TODO
Remove completed TODO