cleanup and fixes

Change-Id: Ib21a73e45251ea2c8623fd057cb44689271ff94f