Cleanup and repair of recipes to match new refactoring