clean up

Change-Id: I6cc13c647df99783142f6931201816720ec407c6