remove not necessary code