choreographer issues & related cleanups