Final round of cleanup for 1.1 release