Remove some extraneous code