clean up some packages

Change-Id: I93ebc6437dc24b3850617cb754e7bda6bf4f58c9