Merge "More cleanup when removing accounts with removeUnusedAccounts.php"