Refactor - correct package name.
Unused method.
Cleanup - inject rather than inline new up.
Clean up empty interface methods.