Account Management: some more cleanup