cleanup and recipes for 2.1 release