diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index 78a44fd67..b62761cb0 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -43,11 +43,9 @@ import com.omertron.themoviedbapi.methods.TmdbReviews;
 import com.omertron.themoviedbapi.methods.TmdbSearch;
 import com.omertron.themoviedbapi.methods.TmdbTV;
 import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model2.movie.MovieDb;
 import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
 import com.omertron.themoviedbapi.model2.Certification;
 import com.omertron.themoviedbapi.model2.FindResults;
-import com.omertron.themoviedbapi.model2.media.MediaBasic;
 import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model2.account.Account;
 import com.omertron.themoviedbapi.model2.artwork.Artwork;
@@ -64,10 +62,12 @@ import com.omertron.themoviedbapi.model2.discover.Discover;
 import com.omertron.themoviedbapi.model2.keyword.Keyword;
 import com.omertron.themoviedbapi.model2.list.ListItem;
 import com.omertron.themoviedbapi.model2.list.UserList;
+import com.omertron.themoviedbapi.model2.media.MediaBasic;
 import com.omertron.themoviedbapi.model2.media.MediaCreditList;
 import com.omertron.themoviedbapi.model2.media.MediaState;
 import com.omertron.themoviedbapi.model2.movie.AlternativeTitle;
 import com.omertron.themoviedbapi.model2.movie.MovieBasic;
+import com.omertron.themoviedbapi.model2.movie.MovieDb;
 import com.omertron.themoviedbapi.model2.movie.ReleaseInfo;
 import com.omertron.themoviedbapi.model2.movie.Translation;
 import com.omertron.themoviedbapi.model2.movie.Video;
@@ -616,8 +616,6 @@ public class TheMovieDbApi {
      *
      * These movies are returned in order of most recently released to oldest. The default response will return 20 movies per page.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param companyId
      * @param language
      * @param page
@@ -1150,8 +1148,6 @@ public class TheMovieDbApi {
      *
      * This is a curated list that will normally contain 100 movies. The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
@@ -1166,8 +1162,6 @@ public class TheMovieDbApi {
      *
      * This list is updated daily. The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
@@ -1182,8 +1176,6 @@ public class TheMovieDbApi {
      *
      * The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
index bee2aa559..427762404 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
@@ -76,8 +76,6 @@ public class TmdbCompanies extends AbstractMethod {
      *
      * These movies are returned in order of most recently released to oldest. The default response will return 20 movies per page.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param companyId
      * @param language
      * @param page
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
index ac3528ffc..05278700a 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
@@ -21,17 +21,17 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
 import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
-import com.omertron.themoviedbapi.model2.movie.MovieDb;
-import com.omertron.themoviedbapi.model2.movie.ReleaseInfo;
-import com.omertron.themoviedbapi.model2.movie.Translation;
-import com.omertron.themoviedbapi.model2.movie.Video;
-import com.omertron.themoviedbapi.model2.media.MediaState;
 import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model2.artwork.Artwork;
 import com.omertron.themoviedbapi.model2.keyword.Keyword;
 import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.model2.media.MediaCreditList;
+import com.omertron.themoviedbapi.model2.media.MediaState;
 import com.omertron.themoviedbapi.model2.movie.AlternativeTitle;
+import com.omertron.themoviedbapi.model2.movie.MovieDb;
+import com.omertron.themoviedbapi.model2.movie.ReleaseInfo;
+import com.omertron.themoviedbapi.model2.movie.Translation;
+import com.omertron.themoviedbapi.model2.movie.Video;
 import com.omertron.themoviedbapi.model2.review.Review;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.tools.ApiUrl;
@@ -136,7 +136,7 @@ public class TmdbMovies extends AbstractMethod {
             }
             return movie;
         } catch (IOException ex) {
-            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get movie info", url, ex);
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get movie info (IMDB)", url, ex);
         }
     }
 
@@ -162,7 +162,7 @@ public class TmdbMovies extends AbstractMethod {
         try {
             return MAPPER.readValue(webpage, MediaState.class);
         } catch (IOException ex) {
-            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get movie info", url, ex);
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get account state", url, ex);
         }
     }
 
@@ -560,8 +560,6 @@ public class TmdbMovies extends AbstractMethod {
      *
      * This is a curated list that will normally contain 100 movies. The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
@@ -590,8 +588,6 @@ public class TmdbMovies extends AbstractMethod {
      *
      * This list is updated daily. The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
@@ -620,8 +616,6 @@ public class TmdbMovies extends AbstractMethod {
      *
      * The default response will return 20 movies.
      *
-     * TODO: Implement more than 20 movies
-     *
      * @param language
      * @param page
      * @return
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/MediaTypeMixIn.java b/src/main/java/com/omertron/themoviedbapi/model2/MediaTypeMixIn.java
deleted file mode 100644
index 1a169baa7..000000000
--- a/src/main/java/com/omertron/themoviedbapi/model2/MediaTypeMixIn.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.omertron.themoviedbapi.model2;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.omertron.themoviedbapi.model2.movie.MovieBasic;
-import com.omertron.themoviedbapi.model2.tv.TVBasic;
-import com.omertron.themoviedbapi.model2.tv.TVEpisodeBasic;
-
-@JsonTypeInfo(
-        use = JsonTypeInfo.Id.NAME,
-        include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
-        property = "media_type",
-        defaultImpl = MovieBasic.class
-)
-@JsonSubTypes({
-    @JsonSubTypes.Type(value = MovieBasic.class, name = "movie"),
-    @JsonSubTypes.Type(value = TVBasic.class, name = "tv"),
-    @JsonSubTypes.Type(value = TVEpisodeBasic.class, name = "episode")
-})
-public class MediaTypeMixIn {
-
-}