Remove more tmdb bits.
(cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6)