Per RFC, continue cleanup with minor change to one file
Per RFC, continue cleanup with minor changes to one file