Getting rid of unnecessary code we don't need