Remove console.logs and clean up existing code