Cleanup
move things around
cleanup
Remove continuation token logic