removed all extraneous code