Removed unneccessary TODO comments.