Removed "todos" discussed with Kuangya