Complete cleanup of agents based on new abstractions;