MBH: attempting to cleanup this mess