Remove stale debugging code
Fix accounting of permanently allocated objects