cleanup and fixes 2

Change-Id: Id6f06e0c7e70d27502ab9332b4664b17823bf20c