Removed some unused imports and made a minor change as to use more of the Guava framework.