more cleaning

Change-Id: Id6af102ac7aed29e5b1ee599397f98fb55da1ca5