cleanup and consolidation for agent only cookbook