clean up unused stuff

Change-Id: I55f5915a5dfd7ace542dfc9be72094fedeeee0af