Got rid of all the extra traces