Adds remove_image support