some cleanup and fixup

Change-Id: I0bae2c992647ab7d3643daf8e62fcf414bcf4162