Some cleanup of loading market group tree