Remove nodes spec., deprecated in new way

Change-Id: I2677b0a5c5b564648ec3a1e8a0cd9bb9ad289080
34 files changed