
            Remove some unused arguments and imports and outdated comments

8f71086