updated TODO and remove_rings typo