Remove some unnecessary/duplicates and add new characters