clean up TODOs
no need for next to be atomic
remove debug code