Preliminary cleanup of GenericAgentLoadPolicy