Removed unnecessary & superfluous code