removed some extraneous code