Clean up.
1.9
1.10