MBH: code cleanup