Some clean-up

Change-Id: Ic88c2f26c6b2da5dbe86a4782d88a30c7afdd232