Remove dead code
More debug output
More debug output