Remove console and add logs