Removed unnecessary warnings

Change-Id: Idfb267e538a2f3e4c717b693a31b3c6408d878de
8 files changed