...some cleanup

Change-Id: I679efb0a52857c128da9b316c14d64b82238f816