Take out debugging of todos. closes #740