cleanup and consolidation of agent only recipes.  removal
of server related code