Dependency injection on ClientApplication type
Cleanup on import statements