Merge pull request #1028 from slingamn/cleanups

two cleanups

irc/accounts.go

@@ -1305,14 +1305,10 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
 		delete(am.skeletonToAccount, additionalSkel)
 	}
 	for _, client := range clients {
-		if config.Accounts.RequireSasl.Enabled {
 		client.Logout()
 		client.Quit(client.t("You are no longer authorized to be on this server"), nil)
 		// destroy acquires a semaphore so we can't call it while holding a lock
 		go client.destroy(nil)
-		} else {
-			am.logoutOfAccount(client)
-		}
 	}
 
 	if err != nil && !erase {

irc/nickname.go

@@ -18,7 +18,6 @@ import (
 var (
 	restrictedNicknames = []string{
 		"=scene=", // used for rp commands
-		"HistServ", // used to play back JOIN, PART, etc. to legacy clients
 	}
 
 	restrictedCasefoldedNicks = make(map[string]bool)