Refactored thumbnails removal