Remove comment, it is no longer true
Adding todo and move index close to first use