cleanup of extraneous code