Removing some redundant resource definitions

Change-Id: I68ae602116e6eb334dfce2a013fcc42068c464bf
6 files changed