Removed some old useless code