MBH: cleanup