diff --git a/src/client/ClientDataResolver.js b/src/client/ClientDataResolver.js
index 3241ad2c2..9c2ab5d02 100644
--- a/src/client/ClientDataResolver.js
+++ b/src/client/ClientDataResolver.js
@@ -31,7 +31,6 @@ class ClientDataResolver {
    * * A User object
    * * A Snowflake
    * * A Message object (resolves to the message author)
-   * * A Guild object (owner of the guild)
    * * A GuildMember object
    * @typedef {User|Snowflake|Message|Guild|GuildMember} UserResolvable
    */
@@ -46,7 +45,6 @@ class ClientDataResolver {
     if (typeof user === 'string') return this.client.users.get(user) || null;
     if (user instanceof GuildMember) return user.user;
     if (user instanceof Message) return user.author;
-    if (user instanceof Guild) return user.owner;
     return null;
   }
 
@@ -59,7 +57,6 @@ class ClientDataResolver {
     if (user instanceof User || user instanceof GuildMember) return user.id;
     if (typeof user === 'string') return user || null;
     if (user instanceof Message) return user.author.id;
-    if (user instanceof Guild) return user.ownerID;
     return null;
   }
 
@@ -126,8 +123,6 @@ class ClientDataResolver {
   /**
    * Data that can be resolved to give a Channel object. This can be:
    * * A Channel object
-   * * A Message object (the channel the message was sent in)
-   * * A Guild object (the #general channel)
    * * A Snowflake
    * @typedef {Channel|Guild|Message|Snowflake} ChannelResolvable
    */
@@ -140,8 +135,6 @@ class ClientDataResolver {
   resolveChannel(channel) {
     if (channel instanceof Channel) return channel;
     if (typeof channel === 'string') return this.client.channels.get(channel) || null;
-    if (channel instanceof Message) return channel.channel;
-    if (channel instanceof Guild) return channel.channels.get(channel.id) || null;
     return null;
   }
 
@@ -153,8 +146,6 @@ class ClientDataResolver {
   resolveChannelID(channel) {
     if (channel instanceof Channel) return channel.id;
     if (typeof channel === 'string') return channel;
-    if (channel instanceof Message) return channel.channel.id;
-    if (channel instanceof Guild) return channel.defaultChannel.id;
     return null;
   }