MBH: clean up