Remove debugging code, add TODO notes.