Goodbye debug log calls
This is slightly better than current master. Going to merge.