cleaned the superfluous code