remove lots of console.log and commented out lines...