Code cleanup and NXTF1V3 tools cleanup

Change-Id: I6dbc300c821b59b9d90e1359c019841adb20be71