Code cleanup.
Preparing next change log.