Remove outdated TODO's and comment