Removing
Refactoring account lookup