leftovers

Change-Id: I739b052c40ab5efe78343f4268215ffbce3932c8