Get rid of extraneous code