general clean up

Change-Id: If3ff32a3974368d9ea2756d3d9a22d4713e704fa