Getting rid of all the old code