remove nn
more cleanup