Remove more debugging code, remove done TODO