Remove old and useless code