Removing IMDB
Removing plusplus
Merging in upstream changes