upgrade some of recipes/
cleanups