cleanup for #208