Urushi: CleanUp

Change-Id: I8d6e70fcfcca561eedef574ae2fb6a2905c0fcef