extraneous code removed