Clean & fix

Change-Id: I6b0337c407a8fa9987a418fb4b3e16f2aa69dd1b