Removed unused imports and variables.  Marked unused arguments.