Cleaned up comment out and unused debug output