Removing extraneous code