Removing obsolete shadows

Change-Id: I9dcaa69e4e86130642be15e3585f5898dd866839
8 files changed