removed todo and comments