Removing some calls to console.log