WIP many-body states and cleanup