rebuild, removing console.logs