MBH: cleanup, site config