Images are now removed properly