remove unused debug state; further simplify call stack