Removed some TODO comments.