Cleanup for 2.5.2 RC.