SOC-3006: Remove redundant dependencies