17240 removed unnecessary dependencies

- ensure that the module does not depend on every other module