diff --git a/commands/guild.go b/commands/guild.go
index 4d784a8..f06a2bc 100644
--- a/commands/guild.go
+++ b/commands/guild.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"fmt"
 	"math"
-	"regexp"
 	"sort"
 	"strings"
 	"unicode/utf8"
@@ -13,8 +12,6 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-var REGEX_EMOTE = regexp.MustCompile(`<(?:\x{200b}|&)?a?:(\w+):(\d+)>`)
-
 type GuildListing struct {
   Name string
   Members int
@@ -58,90 +55,24 @@ func ListGuildsCommand(session *discordgo.Session) {
   fmt.Print("\n\r")
 }
 
-func GetSortedChannels(session *discordgo.Session, guildId string, withCategories bool) []*discordgo.Channel {
+func GetSortedChannels(session *discordgo.Session, guildId string) []*discordgo.Channel {
   channels := make([]*discordgo.Channel, 0)
   guild, err := session.State.Guild(guildId)
   if err != nil {
     return channels
   }
 
-  if withCategories {
-    categories := make(map[string][]*discordgo.Channel)
-
-    for _, channel := range guild.Channels {
-      categoryID := "0"
-      if channel.ParentID != "" {
-        categoryID = channel.ParentID
-      }
-
-      _, has := categories[categoryID]
-      if !has {
-        categories[categoryID] = make([]*discordgo.Channel, 0)
-      }
-
-      if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
-        continue
-      }
-      categories[categoryID] = append(categories[categoryID], channel)
+  for _, channel := range guild.Channels {
+    if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
+      continue
     }
-
-    for id, channels := range categories {
-      sort.Slice(channels, func(i, j int) bool {
-        return channels[i].Position < channels[j].Position
-      })
-      categoryChannels := make([]*discordgo.Channel, 0)
-      if id != "0" {
-        for _, channel := range guild.Channels {
-          if channel.ID == id {
-            categoryChannels = append(categoryChannels, channel)
-            break
-          }
-        }
-      }
-      for _, channel := range channels {
-        categoryChannels = append(categoryChannels, channel)
-      }
-      categories[id] = categoryChannels
-    }
-
-    keys := make([]string, 0, len(categories) - 1)
-    for id := range categories {
-      if id == "0" {
-        continue
-      }
-      keys = append(keys, id)
-    }
-    sort.Slice(keys, func(i, j int) bool {
-      ca, _ := session.State.Channel(keys[i])
-      cb, _ := session.State.Channel(keys[j])
-
-      return ca.Position < cb.Position
-    })
-    sortedCategories := make(map[string][]*discordgo.Channel)
-    sortedCategories["0"] = categories["0"]
-
-    for _, id := range keys {
-      sortedCategories[id] = categories[id]
-    }
-
-    for _, categoryChannels := range sortedCategories {
-      for _, channel := range categoryChannels {
-        channels = append(channels, channel)
-      }
-    }
-  } else {
-    for _, channel := range guild.Channels {
-      if channel.Type != discordgo.ChannelTypeGuildText && channel.Type != discordgo.ChannelTypeGuildNews {
-        continue
-      }
-      channels = append(channels, channel)
-    }
-
-    sort.Slice(channels, func(i, j int) bool {
-      return channels[i].Position < channels[j].Position
-    })
+    channels = append(channels, channel)
   }
 
+  sort.Slice(channels, func(i, j int) bool {
+    return channels[i].Position < channels[j].Position
+  })
+
   return channels
 }
 
@@ -153,7 +84,7 @@ func ListChannelsCommand(session *discordgo.Session) {
   }
 
   longest := 0
-  channels := GetSortedChannels(session, currentGuild, true)
+  channels := GetSortedChannels(session, currentGuild)
 
   for _, channel := range channels {
     perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
@@ -162,18 +93,12 @@ func ListChannelsCommand(session *discordgo.Session) {
     }
 
     private := perms & discordgo.PermissionViewChannel == 0
-    category := channel.Type == discordgo.ChannelTypeGuildCategory
-
-    catLen := 0
-    if category {
-      catLen = 6
-    }
 
     privLen := 0
     if private {
       privLen = 1
     }
-    length := utf8.RuneCountInString(channel.Name) + privLen + catLen
+    length := utf8.RuneCountInString(channel.Name) + privLen
 
     if length > longest {
       longest = int(math.Min(25, float64(length)))
@@ -181,7 +106,7 @@ func ListChannelsCommand(session *discordgo.Session) {
   }
 
   fmt.Print("\n\r")
-  fmt.Printf("  %*s    created  topic\n\r", longest, "channel-name")
+  fmt.Printf("  %*s  topic\n\r", longest, "channel-name")
   fmt.Print(strings.Repeat("-", 80) + "\n\r")
   for _, channel := range channels {
     perms, err := session.State.UserChannelPermissions(session.State.User.ID, channel.ID)
@@ -190,13 +115,8 @@ func ListChannelsCommand(session *discordgo.Session) {
     }
 
     private := perms & discordgo.PermissionViewChannel == 0
-    category := channel.Type == discordgo.ChannelTypeGuildCategory
-    topic := REGEX_EMOTE.ReplaceAllString(channel.Topic, ":$1:")
-    topic = strings.ReplaceAll(topic, "\n", " ")
+    topic := strings.ReplaceAll(channel.Topic, "\n", " ")
     name := channel.Name
-    if category {
-      name = "-- " + name + " --"
-    }
     if private {
       name = "*" + name
     }
@@ -207,18 +127,12 @@ func ListChannelsCommand(session *discordgo.Session) {
     }
 
     topicLength := utf8.RuneCountInString(topic)
-    longestTopic := 80 - (longest + 5) - 11
+    longestTopic := 80 - (longest + 5)
     if topicLength > longestTopic {
       topic = topic[:(longestTopic - 1)] + "\u2026"
     }
 
-    created := "??-???-??"
-    timestamp, err := discordgo.SnowflakeTimestamp(channel.ID)
-    if err == nil {
-      created = timestamp.Format("02-Jan-06")
-    }
-
-    fmt.Printf("  %*s  %s  %s\n\r", longest, name, created, topic)
+    fmt.Printf("  %*s  %s\n\r", longest, name, topic)
   }
   fmt.Print(strings.Repeat("-", 80) + "\n\r")
   fmt.Print("\n\r")
@@ -248,7 +162,7 @@ func SwitchGuild(session *discordgo.Session, input string) {
       state.SetCurrentGuild(target)
       last := state.GetLastChannel(target)
       if last == "" {
-        channels := GetSortedChannels(session, target, false)
+        channels := GetSortedChannels(session, target)
         topChannel := channels[0]
 
         state.SetCurrentChannel(topChannel.ID)
diff --git a/lib/messages.go b/lib/messages.go
index 36e31d0..7296566 100644
--- a/lib/messages.go
+++ b/lib/messages.go
@@ -21,7 +21,6 @@ type MessageOptions struct {
   Name string
   Channel string
   Bot bool
-  Webhook bool
   Attachments []*discordgo.MessageAttachment
   Stickers []*discordgo.Sticker
   Reply *discordgo.Message
@@ -178,8 +177,6 @@ func FormatMessage(session *discordgo.Session, options MessageOptions) {
       nameColor := "cyan+b"
       if options.IsMention {
         nameColor = "red+b"
-      } else if options.Webhook {
-        nameColor = "magenta+b"
       } else if options.Bot {
         nameColor = "yellow+b"
       }
@@ -296,7 +293,6 @@ func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options
       options.Name = msg.Author.Username
       options.Channel = msg.ChannelID
       options.Bot = msg.Author.Bot
-      options.Webhook = msg.WebhookID != ""
       options.Attachments = msg.Attachments
       options.Stickers = msg.StickerItems
       if i == 0 {
@@ -315,7 +311,6 @@ func ProcessMessage(session *discordgo.Session, msg *discordgo.Message, options
     options.Name = msg.Author.Username
     options.Channel = msg.ChannelID
     options.Bot = msg.Author.Bot
-    options.Webhook = msg.WebhookID != ""
     options.Attachments = msg.Attachments
     options.Stickers = msg.StickerItems
     options.Reply = msg.ReferencedMessage