add timeout option to remove_container and remove_image