MB-49
removed some unused code.