removed another large chunk of superfluous code