removed most console.logs