Refactored Account service to remove wallet