revert debugging change, update todo