commented accountmanager, deleted accountlistener