Removing unused imports

Code should be warning free now.