(#25) Clean up.