Some code cleanup

- removing unused code and debugging console.log's