Get rid of useless code