BS-7456, remove unused dependencies and add missing used dependencies
for a better understanding of module dependencies