Removes some old useless code