Remove comment for implemented todo