Clean it up

Change-Id: Ib5a823ff43f0331343ef1c77732cc6a3277d775f