remove folder_image
Improved version