* Removed a couple debugging statements
* Removed an unused method