[NT] Remove unused part of code