n7100: cleanup

Change-Id: I0b9af9c0338fb9fd2b04c0f79e777ad5ad8dc354