MBH: major cleanup