Remove TODO's as it gets harder to merge and find duplicates when more lines are added