Remove some logging, add account manager