Clean-up changes.