Get rid of unnecessary