Removing all old code