More cleanup.
Remove movement .simulate's dependency on world.