Get rid of unnecessary overhead