Remove legacy accountsEntry garbage