Removes unused imports from umbrella header
Merge branch 'fix/umbrella-imports' into develop

* fix/umbrella-imports:
  Removes unused imports from umbrella header