Pretty sure these arent needed

Get rid of them

Change-Id: Icd9860ead1671799633832088386de685cfb4739