pulled out extraneous code