removed superfluous code