zrrichards:  Remove debugging code and add TODO