Remove things we won't need and remove duplicates and add a couple