Removing images and fixing api