Get rid of old useless code