cleaned up several classes
  - uncommented unused variables
  - added generic wildcard type argument to several declarations to avoid warnings in the IDE
  - removed unused imports