Changes and cleanup.