Cleanup museums

There's a failing test that gets fixed by the other branch.