Fix issues regarding removal of accounts