Merge "Cleanup deprecated 4A configuration files"