more continuation cleanups