removed unused commented code, and debugging print statements