Removed superfluous code