Got rid of all of the old code