Added cleanup for images