Get rod of some old code