Cleanup. More Debug work.