MBH: finishing cleanup