Clean up in preparation for 2.6.1 release