diff --git a/lib/Tmdb/Model/Movie.php b/lib/Tmdb/Model/Movie.php
index 0ca5b9b7..94622f4c 100644
--- a/lib/Tmdb/Model/Movie.php
+++ b/lib/Tmdb/Model/Movie.php
@@ -838,8 +838,6 @@ public function setTrailers($trailers)
     }
 
     /**
-     * @todo fix the phpdoc when we have actually implemented support for more providers in the future
-     *
      * @return \Tmdb\Model\Common\Trailer\Youtube[]
      */
     public function getTrailers()
diff --git a/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php b/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
index 8ac74856..68b3b6eb 100644
--- a/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
+++ b/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
@@ -234,7 +234,6 @@ public function certificationCountry($country)
      * Expected value is a valid certification for the specificed 'certification_country'.
      *
      * @param mixed $value
-     * @todo fix method parameter name and specification
      * @return $this
      */
     public function certificationLte($value)
diff --git a/lib/Tmdb/Repository/SearchRepository.php b/lib/Tmdb/Repository/SearchRepository.php
index 12352cc4..f06541c3 100644
--- a/lib/Tmdb/Repository/SearchRepository.php
+++ b/lib/Tmdb/Repository/SearchRepository.php
@@ -149,7 +149,6 @@ public function searchPerson($query, PersonSearchQuery $parameters, array $heade
      * @param ListSearchQuery $parameters
      * @param array $headers
      *
-     * @todo fix return docblock
      * @return ResultCollection
      */
     public function searchList($query, ListSearchQuery $parameters, array $headers = array()) {
diff --git a/test/Tmdb/Tests/Model/Common/SpokenLanguageTest.php b/test/Tmdb/Tests/Model/Common/SpokenLanguageTest.php
index f8d174de..9fdbbb06 100644
--- a/test/Tmdb/Tests/Model/Common/SpokenLanguageTest.php
+++ b/test/Tmdb/Tests/Model/Common/SpokenLanguageTest.php
@@ -20,7 +20,6 @@ class SpokenLanguageTest extends TestCase
 {
     /**
      * @test
-     * @todo fix
      */
     public function shouldBeFunctional()
     {
diff --git a/test/Tmdb/Tests/Model/Common/TranslationTest.php b/test/Tmdb/Tests/Model/Common/TranslationTest.php
index 652fb868..c78f8b9e 100644
--- a/test/Tmdb/Tests/Model/Common/TranslationTest.php
+++ b/test/Tmdb/Tests/Model/Common/TranslationTest.php
@@ -20,7 +20,6 @@ class TranslationTest extends TestCase
 {
     /**
      * @test
-     * @todo fix
      */
     public function shouldBeFunctional()
     {
diff --git a/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php b/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
index 0a319aca..98bf767e 100644
--- a/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
+++ b/test/Tmdb/Tests/Model/Query/Discover/DiscoverTvQueryTest.php
@@ -18,7 +18,6 @@
 class DiscoverTvQueryTest extends TestCase
 {
     /**
-     * @todo expand
      * @test
      */
     public function shouldCreateValidQuery()
diff --git a/test/Tmdb/Tests/Repository/MovieRepositoryTest.php b/test/Tmdb/Tests/Repository/MovieRepositoryTest.php
index d306d699..a904427c 100644
--- a/test/Tmdb/Tests/Repository/MovieRepositoryTest.php
+++ b/test/Tmdb/Tests/Repository/MovieRepositoryTest.php
@@ -120,7 +120,6 @@ public function shouldGetReviews()
 
     /**
      * @test
-     * @todo FIX
      */
     public function shouldGetLists()
     {