remove type stuff

Change-Id: I239fcf42e850f97eccdc12905df8602d6f255877