Fix #504 - Thumbnails are now correctly removed.