Delete of unnecessary code