Removed todo and logs