More clean-up

Change-Id: If3f07db973138055eea60fbce7b339cf58d4e483