MODE-2134 Removed dependencies which should not be part of the BOM.