remove all the extras