Cleanup and change log update.