removed commented dbg calls