Removed/commented superfluous code