rm - no longer needed.

Change-Id: Ie496eb8d6d68e79be82c58d032a0b9702f5b1403
mod - to reflect changes.

Change-Id: I72a35e4ad9da64311b6e9f362402455f2e044fc7