remove console.log, and cleanup