bmr: more cleanup and additional references