Removed a couple unused imports.

A few standards fixes.