Removing all the old code