Clean up.
Bugfix in iterative dynamics.