Cleaning up the 3.5 to 3.6 upgrade guide