Removed old TODOs and usless comments.