Cleaned up outdated TODO comments.