Clean up various changes.