Moved out TODO comments.