Removing not necessary code