clean some NI stuff