more cleanup for #11