MBH: cleanup for 2013