Got rid of superfluous code