Remove of console logs and final comments