Fix issues raised by Sean

- remove console.log
- remove commented out code