Remove old useless code