Removed finished TODO comments.