get rid of unnecessary code.