get rid of extraneous code