Removed a bunch of warnings - unused imports, etc.