removed untested unneded lines