Remove Thumbnail stuff (to be resolved later)