more cleanup for #137