Merge "Cleanup some details about the accounts files"