Merge "Clean up ConfigActivator"