AW: Remove leaf dependencies