Remove debug statement and unused vars