Clearing up warnings

Removing unused imports, and adding parameters to raw types.