Get rid of this extra stuff