Cleanup of the Activator class