Remove unnecessary casts

Change-Id: Iafc7727a22d657dfb6bc97ed767907cce3679364